diff options
Diffstat (limited to 'cinderclient')
| -rw-r--r-- | cinderclient/v1/volume_snapshots.py | 7 | ||||
| -rw-r--r-- | cinderclient/v1/volume_transfers.py | 6 | ||||
| -rw-r--r-- | cinderclient/v1/volumes.py | 6 | ||||
| -rw-r--r-- | cinderclient/v3/cgsnapshots.py | 5 | ||||
| -rw-r--r-- | cinderclient/v3/consistencygroups.py | 5 | ||||
| -rw-r--r-- | cinderclient/v3/volume_transfers.py | 6 |
6 files changed, 10 insertions, 25 deletions
diff --git a/cinderclient/v1/volume_snapshots.py b/cinderclient/v1/volume_snapshots.py index 6ce8ecc..78d6dfa 100644 --- a/cinderclient/v1/volume_snapshots.py +++ b/cinderclient/v1/volume_snapshots.py @@ -17,13 +17,10 @@ Volume snapshot interface (1.1 extension). """ -try: - from urllib import urlencode -except ImportError: - from urllib.parse import urlencode +import six +from six.moves.urllib.parse import urlencode from cinderclient import base -import six class Snapshot(base.Resource): diff --git a/cinderclient/v1/volume_transfers.py b/cinderclient/v1/volume_transfers.py index 633f2ac..f5135b8 100644 --- a/cinderclient/v1/volume_transfers.py +++ b/cinderclient/v1/volume_transfers.py @@ -17,11 +17,9 @@ Volume transfer interface (1.1 extension). """ -try: - from urllib import urlencode -except ImportError: - from urllib.parse import urlencode import six +from six.moves.urllib.parse import urlencode + from cinderclient import base diff --git a/cinderclient/v1/volumes.py b/cinderclient/v1/volumes.py index 22cf5aa..6d62fc1 100644 --- a/cinderclient/v1/volumes.py +++ b/cinderclient/v1/volumes.py @@ -17,11 +17,9 @@ Volume interface (1.1 extension). """ -try: - from urllib import urlencode -except ImportError: - from urllib.parse import urlencode import six +from six.moves.urllib.parse import urlencode + from cinderclient import base diff --git a/cinderclient/v3/cgsnapshots.py b/cinderclient/v3/cgsnapshots.py index 951cedf..ca568bd 100644 --- a/cinderclient/v3/cgsnapshots.py +++ b/cinderclient/v3/cgsnapshots.py @@ -16,10 +16,7 @@ """cgsnapshot interface (v3 extension).""" import six -try: - from urllib import urlencode -except ImportError: - from urllib.parse import urlencode +from six.moves.urllib.parse import urlencode from cinderclient import base from cinderclient.openstack.common.apiclient import base as common_base diff --git a/cinderclient/v3/consistencygroups.py b/cinderclient/v3/consistencygroups.py index 2d5421e..0ed4e50 100644 --- a/cinderclient/v3/consistencygroups.py +++ b/cinderclient/v3/consistencygroups.py @@ -16,10 +16,7 @@ """Consistencygroup interface (v3 extension).""" import six -try: - from urllib import urlencode -except ImportError: - from urllib.parse import urlencode +from six.moves.urllib.parse import urlencode from cinderclient import base from cinderclient.openstack.common.apiclient import base as common_base diff --git a/cinderclient/v3/volume_transfers.py b/cinderclient/v3/volume_transfers.py index 40aa15a..7eea06a 100644 --- a/cinderclient/v3/volume_transfers.py +++ b/cinderclient/v3/volume_transfers.py @@ -17,11 +17,9 @@ Volume transfer interface (v3 extension). """ -try: - from urllib import urlencode -except ImportError: - from urllib.parse import urlencode import six +from six.moves.urllib.parse import urlencode + from cinderclient import base |