diff options
| author | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2020-06-16 13:51:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 08:51:47 -0400 |
| commit | a3f11567d930b7da0db068c3b313f6f4abbf12a1 (patch) | |
| tree | ee9f7b2e8a8e088b4f745f07d79867ad2b163211 /synctl | |
| parent | Convert the device message and pagination handlers to async/await. (#7678) (diff) | |
| download | synapse-a3f11567d930b7da0db068c3b313f6f4abbf12a1.tar.xz | |
Replace all remaining six usage with native Python 3 equivalents (#7704)
Diffstat (limited to 'synctl')
| -rwxr-xr-x | synctl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synctl b/synctl index 960fd357ee..ca398b84bd 100755 --- a/synctl +++ b/synctl @@ -26,8 +26,6 @@ import subprocess import sys import time -from six import iteritems - import yaml from synapse.config import find_config_files @@ -251,7 +249,7 @@ def main(): os.environ["SYNAPSE_CACHE_FACTOR"] = str(cache_factor) cache_factors = config.get("synctl_cache_factors", {}) - for cache_name, factor in iteritems(cache_factors): + for cache_name, factor in cache_factors.items(): os.environ["SYNAPSE_CACHE_FACTOR_" + cache_name.upper()] = str(factor) worker_configfiles = [] @@ -362,7 +360,7 @@ def main(): if worker.cache_factor: os.environ["SYNAPSE_CACHE_FACTOR"] = str(worker.cache_factor) - for cache_name, factor in iteritems(worker.cache_factors): + for cache_name, factor in worker.cache_factors.items(): os.environ["SYNAPSE_CACHE_FACTOR_" + cache_name.upper()] = str(factor) if not start_worker(worker.app, configfile, worker.configfile): |