summaryrefslogtreecommitdiff
path: root/swift/proxy/controllers/container.py
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2015-10-08 15:03:52 +0200
committerVictor Stinner <vstinner@redhat.com>2015-10-08 15:24:13 +0200
commitc0af385173658fa149bddf155aeb1ae0bbd4eb7e (patch)
treec4cb8c7bd794f6bdec96983e8cc895884958ccb2 /swift/proxy/controllers/container.py
parentf2cac20d17b081e7b9b6285546414902aa2bdbec (diff)
downloadswift-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 'swift/proxy/controllers/container.py')
-rw-r--r--swift/proxy/controllers/container.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/swift/proxy/controllers/container.py b/swift/proxy/controllers/container.py
index 3e4a2bb03..d5e52618c 100644
--- a/swift/proxy/controllers/container.py
+++ b/swift/proxy/controllers/container.py
@@ -14,9 +14,9 @@
# limitations under the License.
from swift import gettext_ as _
-from urllib import unquote
import time
+from six.moves.urllib.parse import unquote
from swift.common.utils import public, csv_append, Timestamp
from swift.common.constraints import check_metadata
from swift.common import constraints