summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-05-02 16:16:01 +0100
committerRichard van der Hoff <richard@matrix.org>2018-05-02 16:16:01 +0100
commit415c6b672ef08f4640cf48e80b62ca508e45279b (patch)
treed2e1598e8258c33bac7f370c3e703b7c14403a52 /synapse/util
parentRemove spurious unittest.DEBUG (diff)
parentMerge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaks (diff)
downloadsynapse-415c6b672ef08f4640cf48e80b62ca508e45279b.tar.xz
Merge branch 'develop' into rav/more_logcontext_leaks
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/logformatter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/logformatter.py b/synapse/util/logformatter.py
index 59ab3c6968..3e42868ea9 100644
--- a/synapse/util/logformatter.py
+++ b/synapse/util/logformatter.py
@@ -32,7 +32,7 @@ class LogFormatter(logging.Formatter):
         super(LogFormatter, self).__init__(*args, **kwargs)
 
     def formatException(self, ei):
-        sio = StringIO.StringIO()
+        sio = StringIO()
         (typ, val, tb) = ei
 
         # log the stack above the exception capture point if possible, but