summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-30 00:59:04 +0100
committerGitHub <noreply@github.com>2018-04-30 00:59:04 +0100
commit049b0b5af223699df3571fa47ed4e48b968bb342 (patch)
treedc47c250ce38d03173d981397bc85f74ce1951c0 /synapse/util
parentMerge pull request #3145 from NotAFile/py3-tests (diff)
parentreplace stringIO imports (diff)
downloadsynapse-049b0b5af223699df3571fa47ed4e48b968bb342.tar.xz
Merge pull request #3154 from NotAFile/py3-stringio
Replace stringIO imports with six
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