summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortanlin <lin.tan@intel.com>2014-02-12 11:16:36 +0800
committertanlin <lin.tan@intel.com>2014-02-25 11:44:25 +0800
commite621a417b46125460e4c87667adfd05f21e63114 (patch)
tree7c25f047facb28e9e7fb0d19609665dc42e3449f
parent951d8f366ce68238e2988aadd913b2d12656bbb3 (diff)
downloadzuul-e621a417b46125460e4c87667adfd05f21e63114.tar.gz
Use six.moves.urllib.parse instead of urlparse
To keep Python 3.x compatibility, use six.moves.urllib.parse to replace urlparse. Add six as a dependency in test_requirements.txt Change-Id: Ia6cd042970c2d4e5d418a39e25bab32b4d93c544
-rw-r--r--test-requirements.txt1
-rwxr-xr-xtests/test_scheduler.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 34a7a6bac..875a821af 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@ docutils==0.9.1
discover
fixtures>=0.3.14
python-subunit
+six>=1.4.1
testrepository>=0.0.17
testtools>=0.9.32
sphinxcontrib-programoutput
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 9787ae1d7..013aafaba 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -34,11 +34,11 @@ import threading
import time
import urllib
import urllib2
-import urlparse
import git
import gear
import fixtures
+import six.moves.urllib.parse as urlparse
import statsd
import testtools