diff options
| author | Adrian Tschira <nota@notafile.com> | 2018-04-15 21:37:58 +0200 |
|---|---|---|
| committer | Adrian Tschira <nota@notafile.com> | 2018-04-16 00:46:21 +0200 |
| commit | 878995e660e46c5dedb56cde8bd7a3d46838cdd7 (patch) | |
| tree | 5f38eb9d6fb2e6de496c0fc4870486e5f960d986 | |
| parent | Merge branch 'master' of https://github.com/matrix-org/synapse into develop (diff) | |
| download | synapse-878995e660e46c5dedb56cde8bd7a3d46838cdd7.tar.xz | |
Replace Queue with six.moves.queue
and a six.range change which I missed the last time Signed-off-by: Adrian Tschira <nota@notafile.com>
| -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 00ee82d300..e828328243 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -24,7 +24,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__) @@ -78,7 +80,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 |