Do not use the six library.

Change-Id: I3dbfcfa0f5f590a41ed549afd44537d8ed41433a

glanceclient/v2/images.py

@@ -17,8 +17,7 @@ import hashlib
 import json
 from oslo_utils import encodeutils
 from requests import codes
-import six
-from six.moves.urllib import parse
+import urllib.parse
 import warlock
 
 from glanceclient.common import utils
@@ -55,7 +54,7 @@ class Controller(object):
 
     @staticmethod
     def _wrap(value):
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             return [value]
         return value
 
@@ -142,19 +141,19 @@ class Controller(object):
         tags_url_params = []
 
         for tag in tags:
-            if not isinstance(tag, six.string_types):
+            if not isinstance(tag, str):
                 raise exc.HTTPBadRequest("Invalid tag value %s" % tag)
 
             tags_url_params.append({'tag': encodeutils.safe_encode(tag)})
 
         for param, value in filters.items():
-            if isinstance(value, six.string_types):
+            if isinstance(value, str):
                 filters[param] = encodeutils.safe_encode(value)
 
-        url = '/v2/images?%s' % parse.urlencode(filters)
+        url = '/v2/images?%s' % urllib.parse.urlencode(filters)
 
         for param in tags_url_params:
-            url = '%s&%s' % (url, parse.urlencode(param))
+            url = '%s&%s' % (url, urllib.parse.urlencode(param))
 
         if 'sort' in kwargs:
             if 'sort_key' in kwargs or 'sort_dir' in kwargs:
@@ -178,7 +177,7 @@ class Controller(object):
             for dir in sort_dir:
                 url = '%s&sort_dir=%s' % (url, dir)
 
-        if isinstance(kwargs.get('marker'), six.string_types):
+        if isinstance(kwargs.get('marker'), str):
             url = '%s&marker=%s' % (url, kwargs['marker'])
 
         for image, resp in paginate(url, page_size, limit):

glanceclient/v2/metadefs.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 from oslo_utils import encodeutils
-import six
-from six.moves.urllib import parse
+import urllib.parse
 import warlock
 
 from glanceclient.common import utils
@@ -89,7 +88,7 @@ class NamespaceController(object):
     @utils.add_req_id_to_object()
     def _get(self, namespace, header=None, **kwargs):
         """Get one namespace."""
-        query_params = parse.urlencode(kwargs)
+        query_params = urllib.parse.urlencode(kwargs)
         if kwargs:
             query_params = '?%s' % query_params
 
@@ -179,10 +178,10 @@ class NamespaceController(object):
         for param, value in filters.items():
             if isinstance(value, list):
                 filters[param] = encodeutils.safe_encode(','.join(value))
-            elif isinstance(value, six.string_types):
+            elif isinstance(value, str):
                 filters[param] = encodeutils.safe_encode(value)
 
-        url = '/v2/metadefs/namespaces?%s' % parse.urlencode(filters)
+        url = '/v2/metadefs/namespaces?%s' % urllib.parse.urlencode(filters)
 
         for namespace, resp in paginate(url):
             yield namespace, resp

glanceclient/v2/tasks.py

@@ -14,8 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import urllib.parse
+
 from oslo_utils import encodeutils
-import six
 import warlock
 
 from glanceclient.common import utils
@@ -85,10 +86,10 @@ class Controller(object):
                                  % ', '.join(SORT_DIR_VALUES))
 
         for param, value in filters.items():
-            if isinstance(value, six.string_types):
+            if isinstance(value, str):
                 filters[param] = encodeutils.safe_encode(value)
 
-        url = '/v2/tasks?%s' % six.moves.urllib.parse.urlencode(filters)
+        url = '/v2/tasks?%s' % urllib.parse.urlencode(filters)
         for task, resp in paginate(url):
             # NOTE(flwang): remove 'self' for now until we have an elegant
             # way to pass it into the model constructor without conflict