Merge pull request #3244 from NotAFile/py3-six-4

replace some iteritems with six
This commit is contained in:
Amber Brown 2018-05-24 13:04:07 -05:00 committed by GitHub
commit 1f69693347
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 69 additions and 49 deletions

View file

@ -26,6 +26,7 @@ from synapse.util.metrics import Measure, measure_func
import logging
import synapse.metrics
from six import itervalues
metrics = synapse.metrics.get_metrics_for(__name__)
stream_updates_counter = metrics.register_counter(
@ -80,7 +81,7 @@ class ReplicationStreamer(object):
# We only support federation stream if federation sending hase been
# disabled on the master.
self.streams = [
stream(hs) for stream in STREAMS_MAP.itervalues()
stream(hs) for stream in itervalues(STREAMS_MAP)
if stream != FederationStream or not hs.config.send_federation
]