Merge "Use six.moves.urllib.parse urlencode"

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):

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
 
 

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
 
 

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

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

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