Remove six.moves.urllib

Replace the six.moves.urllib with Python 3 style code

Change-Id: Ieb4d0359442cdb1dab17ffa2de74b834199ec74c

trove/common/pagination.py

@@ -15,7 +15,7 @@
 
 import bisect
 import collections
-import six.moves.urllib.parse as urllib_parse
+import urllib.parse as urllib_parse
 
 
 def url_quote(s):

trove/common/utils.py

@@ -19,6 +19,7 @@ import inspect
 import os
 import shutil
 import uuid
+import urllib.parse as urlparse
 
 from eventlet.timeout import Timeout
 import jinja2
@@ -30,7 +31,6 @@ from oslo_utils import importutils
 from oslo_utils import strutils
 from passlib import pwd
 import six
-import six.moves.urllib.parse as urlparse
 
 from trove.common import cfg
 from trove.common import exception

trove/extensions/mysql/common.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from trove.common.db.mysql import models as guest_models
 from trove.common import exception

trove/tests/api/users.py

@@ -13,8 +13,7 @@
 #    under the License.
 
 import time
-
-from six.moves.urllib import parse as urllib_parse
+from urllib import parse as urllib_parse
 
 from proboscis import after_class
 from proboscis.asserts import assert_equal

trove/tests/scenario/runners/user_actions_runners.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves.urllib import parse as urllib_parse
+from urllib import parse as urllib_parse
 
 from proboscis import SkipTest
 

trove/tests/util/__init__.py

@@ -23,6 +23,7 @@
 """
 
 import subprocess
+from urllib.parse import unquote
 try:
     EVENT_AVAILABLE = True
 except ImportError:
@@ -37,7 +38,6 @@ from proboscis.asserts import assert_true
 from proboscis.asserts import Check
 from proboscis.asserts import fail
 from proboscis import SkipTest
-from six.moves.urllib.parse import unquote
 from sqlalchemy import create_engine
 from sqlalchemy.sql.expression import text
 import tenacity