diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:54:43 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:54:43 +0100 |
| commit | 3d1ae6139918ecb013c576a5eb0ed8e06103ebf6 (patch) | |
| tree | 5056d9455cb6a0d72da1dc2b5dcf1a98c6282c6e /tests/util/test_file_consumer.py | |
| parent | Backport deferred.addTimeout (diff) | |
| parent | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff) | |
| download | synapse-3d1ae6139918ecb013c576a5eb0ed8e06103ebf6.tar.xz | |
Merge branch 'develop' into rav/deferred_timeout
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 |