diff options
| author | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
| commit | 9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6 (patch) | |
| tree | 1034b986ea37a081707b489cb3ebe6e4d584defe /tests/util/test_file_consumer.py | |
| parent | Make the logging level configurable (diff) | |
| parent | missing word :| (diff) | |
| download | synapse-9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
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 |