diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-04-23 16:57:23 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-04-23 16:57:23 +0000 |
commit | fb2058f52b6634b88ac0ee892078bbdfc35456d0 (patch) | |
tree | ac3bb4f1a12b53ed30bf4f3b5f39a5a16539b358 | |
parent | cda2573ab695021e4e4eee66ec920541e8068adf (diff) | |
parent | 8830c81db7cd86f983e09cf1f4b8705930184bd4 (diff) | |
download | python-swiftclient-fb2058f52b6634b88ac0ee892078bbdfc35456d0.tar.gz |
Merge "Use quote/unquote from six module for py3"
-rwxr-xr-x | swiftclient/shell.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swiftclient/shell.py b/swiftclient/shell.py index d7415e1..4e8b195 100755 --- a/swiftclient/shell.py +++ b/swiftclient/shell.py @@ -29,7 +29,7 @@ from os.path import dirname, getmtime, getsize, isdir, join, \ from random import shuffle from sys import argv as sys_argv, exit, stderr, stdout from time import sleep, time, gmtime, strftime -from urllib import quote, unquote +from six.moves.urllib.parse import quote, unquote try: import simplejson as json |