diff options
| author | Victor Stinner <vstinner@redhat.com> | 2015-10-08 15:03:52 +0200 |
|---|---|---|
| committer | Victor Stinner <vstinner@redhat.com> | 2015-10-08 15:24:13 +0200 |
| commit | c0af385173658fa149bddf155aeb1ae0bbd4eb7e (patch) | |
| tree | c4cb8c7bd794f6bdec96983e8cc895884958ccb2 /test/functional/__init__.py | |
| parent | f2cac20d17b081e7b9b6285546414902aa2bdbec (diff) | |
| download | swift-c0af385173658fa149bddf155aeb1ae0bbd4eb7e.tar.gz | |
py3: Replace urllib imports with six.moves.urllib
The urllib, urllib2 and urlparse modules of Python 2 were reorganized
into a new urllib namespace on Python 3. Replace urllib, urllib2 and
urlparse imports with six.moves.urllib to make the modified code
compatible with Python 2 and Python 3.
The initial patch was generated by the urllib operation of the sixer
tool on: bin/* swift/ test/.
Change-Id: I61a8c7fb7972eabc7da8dad3b3d34bceee5c5d93
Diffstat (limited to 'test/functional/__init__.py')
| -rw-r--r-- | test/functional/__init__.py | 2 |
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 |