From 04ca787f5b96287124d9f152f31554e4fe726a75 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Thu, 7 Apr 2016 12:45:56 -0400
Subject: [PATCH] Use six.moves.urllib.parse urlencode

Rather than having to do try/except for imports,
just use six.moves for loading this module.

Change-Id: If750253d7e02608fd183675bd97e3956fbfb0853
---
 cinderclient/v1/volume_snapshots.py  | 7 ++-----
 cinderclient/v1/volume_transfers.py  | 6 ++----
 cinderclient/v1/volumes.py           | 6 ++----
 cinderclient/v3/cgsnapshots.py       | 5 +----
 cinderclient/v3/consistencygroups.py | 5 +----
 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 6ce8ecc87..78d6dfae8 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 633f2ac3d..f5135b8e0 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 22cf5aad2..6d62fc178 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 951cedfd1..ca568bd59 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 2d5421e75..0ed4e500c 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 40aa15a8b..7eea06aee 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