summaryrefslogtreecommitdiff
path: root/swiftclient
diff options
context:
space:
mode:
Diffstat (limited to 'swiftclient')
-rw-r--r--swiftclient/client.py4
-rw-r--r--swiftclient/multithreading.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py
index c48f90f..2cb54a1 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -25,8 +25,8 @@ import warnings
from distutils.version import StrictVersion
from requests.exceptions import RequestException, SSLError
-from urllib import quote as _quote
-from urlparse import urlparse, urlunparse
+from six.moves.urllib.parse import quote as _quote
+from six.moves.urllib.parse import urlparse, urlunparse
from time import sleep, time
import six
diff --git a/swiftclient/multithreading.py b/swiftclient/multithreading.py
index cd3c57c..b98702d 100644
--- a/swiftclient/multithreading.py
+++ b/swiftclient/multithreading.py
@@ -15,7 +15,7 @@
from itertools import chain
import sys
from time import sleep
-from Queue import Queue
+from six.moves.queue import Queue
from threading import Thread
from traceback import format_exception