diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-23 11:59:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 11:59:03 +0100 |
| commit | 286e20f2bcbce9c74c80448eb5443aea3d27b336 (patch) | |
| tree | ccc6a7b2edbc3a9b5d4563b5e4281d0d817c0122 /tests/util/test_file_consumer.py | |
| parent | Merge pull request #3106 from NotAFile/py3-six-itervalues-1 (diff) | |
| parent | Make tests py3 compatible (diff) | |
| download | synapse-286e20f2bcbce9c74c80448eb5443aea3d27b336.tar.xz | |
Merge pull request #3109 from NotAFile/py3-tests-fix
Make tests py3 compatible
Diffstat (limited to 'tests/util/test_file_consumer.py')
| -rw-r--r-- | tests/util/test_file_consumer.py | 2 |
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 |