diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-20 15:35:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 15:35:00 +0100 |
| commit | c09a6daf09bac12f7aa5920eb87d15a4b7bf04b5 (patch) | |
| tree | daca6a9318498596b4b150d4aa5e341d92ff694b /synapse | |
| parent | Merge pull request #3103 from NotAFile/py3-baseexcepton-message (diff) | |
| parent | Replace Queue with six.moves.queue (diff) | |
| download | synapse-c09a6daf09bac12f7aa5920eb87d15a4b7bf04b5.tar.xz | |
Merge pull request #3110 from NotAFile/py3-six-queue
Replace Queue with six.moves.queue
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/event_federation.py | 6 | ||||
| -rw-r--r-- | synapse/util/file_consumer.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index a183fc6b50..8fbf7ffba7 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -25,7 +25,9 @@ from synapse.util.caches.descriptors import cached from unpaddedbase64 import encode_base64 import logging -from Queue import PriorityQueue, Empty +from six.moves.queue import PriorityQueue, Empty + +from six.moves import range logger = logging.getLogger(__name__) @@ -79,7 +81,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, front_list = list(front) chunks = [ front_list[x:x + 100] - for x in xrange(0, len(front), 100) + for x in range(0, len(front), 100) ] for chunk in chunks: txn.execute( diff --git a/synapse/util/file_consumer.py b/synapse/util/file_consumer.py index 90a2608d6f..3c8a165331 100644 --- a/synapse/util/file_consumer.py +++ b/synapse/util/file_consumer.py @@ -17,7 +17,7 @@ from twisted.internet import threads, reactor from synapse.util.logcontext import make_deferred_yieldable, preserve_fn -import Queue +from six.moves import queue class BackgroundFileConsumer(object): @@ -49,7 +49,7 @@ class BackgroundFileConsumer(object): # Queue of slices of bytes to be written. When producer calls # unregister a final None is sent. - self._bytes_queue = Queue.Queue() + self._bytes_queue = queue.Queue() # Deferred that is resolved when finished writing self._finished_deferred = None |