summaryrefslogtreecommitdiff
path: root/tests/test_multithreading.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@enovance.com>2014-03-24 18:20:22 +0100
committerGerrit Code Review <review@openstack.org>2014-03-28 15:04:14 +0000
commite3b7ecd2bbc5120444b3c1643fb89ccd47e454bb (patch)
tree81d61ff9d84daf6374ede0db7e7fb9a32d635a95 /tests/test_multithreading.py
parentcdf6f84c360088d39af1b8e1745c102fc44ac362 (diff)
downloadpython-swiftclient-e3b7ecd2bbc5120444b3c1643fb89ccd47e454bb.tar.gz
Python 3: Fix module names in import
Use six.moves to fix imports on Python 3. Change-Id: I35b9405690e9f0607b24d79aa7c00830df954c41
Diffstat (limited to 'tests/test_multithreading.py')
-rw-r--r--tests/test_multithreading.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test_multithreading.py b/tests/test_multithreading.py
index c12f20c..b566837 100644
--- a/tests/test_multithreading.py
+++ b/tests/test_multithreading.py
@@ -18,8 +18,8 @@ import time
import mock
import testtools
import threading
-from cStringIO import StringIO
-from Queue import Queue, Empty
+import six
+from six.moves.queue import Queue, Empty
from swiftclient import multithreading as mt
from swiftclient.exceptions import ClientException
@@ -287,8 +287,8 @@ class TestMultiThreadingManager(ThreadTestCase):
], mock_qfq.call_args_list)
def test_printers(self):
- out_stream = StringIO()
- err_stream = StringIO()
+ out_stream = six.StringIO()
+ err_stream = six.StringIO()
with mt.MultiThreadingManager(
print_stream=out_stream,