diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
| commit | 7f0d8e42885078583d1eab16df2523292ed1148d (patch) | |
| tree | 97d56ee3dd35549820a69b702d574d1704560773 /tests/test_utils/logging_setup.py | |
| parent | Assume key existence. Update docstrings (diff) | |
| parent | remove dead transaction persist code (#5622) (diff) | |
| download | synapse-7f0d8e42885078583d1eab16df2523292ed1148d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfiltrate_data
Diffstat (limited to 'tests/test_utils/logging_setup.py')
| -rw-r--r-- | tests/test_utils/logging_setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_utils/logging_setup.py b/tests/test_utils/logging_setup.py index 813f984199..2d96b0fa8d 100644 --- a/tests/test_utils/logging_setup.py +++ b/tests/test_utils/logging_setup.py @@ -17,7 +17,7 @@ import os import twisted.logger -from synapse.util.logcontext import LoggingContextFilter +from synapse.logging.context import LoggingContextFilter class ToTwistedHandler(logging.Handler): |