summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-28 11:39:37 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-28 13:46:23 +0200
commit4f2f5171b752169e265b5d93c9b4e788171b5326 (patch)
tree20a2832884d9bcbf56285d4e939eb00b16edb453 /synapse/util
parentMerge pull request #3127 from matrix-org/rav/deferred_timeout (diff)
downloadsynapse-4f2f5171b752169e265b5d93c9b4e788171b5326.tar.xz
replace stringIO imports
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 cdbc4bffd7..59ab3c6968 100644
--- a/synapse/util/logformatter.py
+++ b/synapse/util/logformatter.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-import StringIO
+from six import StringIO
 import logging
 import traceback