summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-15 11:22:29 +0000
committerErik Johnston <erik@matrix.org>2016-11-15 11:22:29 +0000
commitf9d156d2700b1c9c2d296b51b1dee4334d47fd71 (patch)
tree7db25172089293450eb5ea88d4ec81c8bffc9687 /synapse
parentMerge pull request #1624 from matrix-org/kegan/idempotent-requests (diff)
downloadsynapse-f9d156d2700b1c9c2d296b51b1dee4334d47fd71.tar.xz
New Flake8 fixes
Diffstat (limited to 'synapse')
-rw-r--r--synapse/python_dependencies.py2
-rw-r--r--synapse/storage/events.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index b9e41770ee..59bc084b11 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -69,6 +69,7 @@ def requirements(config=None, include_conditional=False): def github_link(project, version, egg): return "https://github.com/%s/tarball/%s/#egg=%s" % (project, version, egg) + DEPENDENCY_LINKS = { } @@ -156,6 +157,7 @@ def list_requirements(): result.append(requirement) return result + if __name__ == "__main__": import sys sys.stdout.writelines(req + "\n" for req in list_requirements()) diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 49aeb953bd..ecb79c07ef 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py
@@ -54,6 +54,7 @@ def encode_json(json_object): else: return json.dumps(json_object, ensure_ascii=False) + # These values are used in the `enqueus_event` and `_do_fetch` methods to # control how we batch/bulk fetch events from the database. # The values are plucked out of thing air to make initial sync run faster