summary refs log tree commit diff
path: root/tests/util/test_file_consumer.py
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-15 21:46:23 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-16 00:39:32 +0200
commita1a3c9660ffc1e99f656c1d39ebe57b8857b207d (patch)
tree202271009a7d5e8346a2c1994536283bbd764d07 /tests/util/test_file_consumer.py
parentMerge branch 'master' of https://github.com/matrix-org/synapse into develop (diff)
downloadsynapse-a1a3c9660ffc1e99f656c1d39ebe57b8857b207d.tar.xz
Make tests py3 compatible
This is a mixed commit that fixes various small issues

 * print parentheses
 * 01 is invalid syntax (it was octal in py2)
 * [x for i in 1, 2] is invalid syntax
 * six moves

Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'tests/util/test_file_consumer.py')
-rw-r--r--tests/util/test_file_consumer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/util/test_file_consumer.py b/tests/util/test_file_consumer.py
index 76e2234255..d6e1082779 100644
--- a/tests/util/test_file_consumer.py
+++ b/tests/util/test_file_consumer.py
@@ -20,7 +20,7 @@ from mock import NonCallableMock
 from synapse.util.file_consumer import BackgroundFileConsumer
 
 from tests import unittest
-from StringIO import StringIO
+from six import StringIO
 
 import threading