summaryrefslogtreecommitdiff
path: root/test/functional/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/__init__.py')
-rw-r--r--test/functional/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/__init__.py b/test/functional/__init__.py
index f07d16269..242a4667a 100644
--- a/test/functional/__init__.py
+++ b/test/functional/__init__.py
@@ -16,6 +16,7 @@
from __future__ import print_function
import mock
import os
+from six.moves.urllib.parse import urlparse
import sys
import pickle
import socket
@@ -26,7 +27,6 @@ import functools
import random
from time import time, sleep
-from urlparse import urlparse
from nose import SkipTest
from contextlib import closing
from gzip import GzipFile