summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/util/patch_inline_callbacks.py (renamed from tests/patch_inline_callbacks.py)2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 1055f54e00..bf102244a9 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -20,7 +20,7 @@ import os import sys -from tests.patch_inline_callbacks import do_patch +from synapse.util.patch_inline_callbacks import do_patch # Check that we're not running on an unsupported Python version. if sys.version_info < (3, 5): diff --git a/tests/patch_inline_callbacks.py b/synapse/util/patch_inline_callbacks.py
index a35a1d3305..4fb49b0b2b 100644 --- a/tests/patch_inline_callbacks.py +++ b/synapse/util/patch_inline_callbacks.py
@@ -105,7 +105,7 @@ def do_patch(): def _check_yield_points(f, changes, start_context): - """Wraps a generator that is about to passed to defer.inlineCallbacks + """Wraps a generator that is about to be passed to defer.inlineCallbacks checking that after every yield the log contexts are correct. """