Remove six.moves.urllib usage

Change-Id: I71be65ef7b8f710e9317419d7b38559b39f461b0
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

glance/api/v2/images.py

@@ -17,6 +17,7 @@ import hashlib
 import http.client as http
 import os
 import re
+import urllib.parse as urlparse
 
 from castellan.common import exception as castellan_exception
 from castellan import key_manager
@@ -28,7 +29,6 @@ from oslo_serialization import jsonutils as json
 from oslo_utils import encodeutils
 from oslo_utils import timeutils as oslo_timeutils
 import requests
-import six.moves.urllib.parse as urlparse
 import webob.exc
 
 from glance.api import common

glance/api/v2/metadef_namespaces.py

@@ -14,12 +14,12 @@
 # limitations under the License.
 
 import http.client as http
+import urllib.parse as urlparse
 
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
-import six.moves.urllib.parse as urlparse
 import webob.exc
 from wsme.rest import json
 

glance/api/v2/tasks.py

@@ -16,6 +16,7 @@
 
 import copy
 import http.client as http
+import urllib.parse as urlparse
 
 import debtcollector
 import glance_store
@@ -25,7 +26,6 @@ import oslo_serialization.jsonutils as json
 from oslo_utils import encodeutils
 from oslo_utils import uuidutils
 import six
-import six.moves.urllib.parse as urlparse
 import webob.exc
 
 from glance.api import common

glance/api/versions.py

@@ -14,11 +14,11 @@
 #    under the License.
 
 import http.client
+import urllib
 
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
-from six.moves import urllib
 import webob.dec
 
 from glance.common import wsgi

glance/async_/flows/ovf_process.py

@@ -17,6 +17,7 @@ import os
 import re
 import shutil
 import tarfile
+import urllib
 
 try:
     from defusedxml import cElementTree as ET
@@ -26,7 +27,6 @@ except ImportError:
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils as json
-from six.moves import urllib
 from taskflow.patterns import linear_flow as lf
 from taskflow import task
 

glance/async_/taskflow_executor.py

@@ -13,11 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import urllib
+
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import encodeutils
 from oslo_utils import excutils
-from six.moves import urllib
 from stevedore import driver
 from taskflow import engines
 from taskflow.listeners import logging as llistener

glance/cmd/replicator.py

@@ -19,6 +19,7 @@
 import http.client as http
 import os
 import sys
+import urllib.parse as urlparse
 
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -26,7 +27,6 @@ from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 from oslo_utils import uuidutils
 import six
-import six.moves.urllib.parse as urlparse
 from webob import exc
 
 from glance.common import config

glance/common/auth.py

@@ -31,12 +31,13 @@ Keystone (an identity management system).
    http://service_endpoint/
 
 """
+
 import http.client as http
+import urllib.parse as urlparse
 
 import httplib2
 from keystoneclient import service_catalog as ks_service_catalog
 from oslo_serialization import jsonutils
-import six.moves.urllib.parse as urlparse
 
 from glance.common import exception
 from glance.i18n import _

glance/common/client.py

@@ -24,6 +24,7 @@ import functools
 import http.client
 import os
 import re
+import urllib.parse as urlparse
 
 try:
     from eventlet.green import socket
@@ -44,7 +45,6 @@ from oslo_log import log as logging
 from oslo_utils import encodeutils
 from oslo_utils import netutils
 import six
-import six.moves.urllib.parse as urlparse
 
 from glance.common import auth
 from glance.common import exception

glance/common/exception.py

@@ -16,7 +16,7 @@
 
 """Glance exception subclasses"""
 
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from glance.i18n import _
 

glance/common/location_strategy/store_type.py

@@ -15,8 +15,9 @@
 
 """Storage preference based location strategy module"""
 
+import urllib.parse as urlparse
+
 from oslo_config import cfg
-import six.moves.urllib.parse as urlparse
 
 from glance.i18n import _
 

glance/common/scripts/utils.py

@@ -21,10 +21,10 @@ __all__ = [
     'get_image_data_iter',
 ]
 
+import urllib
 
 from oslo_log import log as logging
 from oslo_utils import timeutils
-from six.moves import urllib
 
 from glance.common import exception
 from glance.i18n import _, _LE

glance/common/store_utils.py

@@ -13,12 +13,12 @@
 #    under the License.
 
 import sys
+import urllib.parse as urlparse
 
 import glance_store as store_api
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import encodeutils
-import six.moves.urllib.parse as urlparse
 
 import glance.db as db_api
 from glance.i18n import _LE, _LW

glance/common/utils.py

@@ -29,17 +29,17 @@ except ImportError:
 from eventlet.green import socket
 
 import functools
-import glance_store
 import os
 import re
+import urllib
 
+import glance_store
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import netutils
 from oslo_utils import strutils
 import six
-from six.moves import urllib
 from webob import exc
 
 from glance.common import exception

glance/tests/functional/__init__.py

@@ -37,6 +37,7 @@ from testtools import content as ttc
 import textwrap
 import time
 from unittest import mock
+import urllib.parse as urlparse
 import uuid
 
 import fixtures
@@ -44,7 +45,6 @@ import glance_store
 from os_win import utilsfactory as os_win_utilsfactory
 from oslo_config import cfg
 from oslo_serialization import jsonutils
-import six.moves.urllib.parse as urlparse
 import testtools
 import webob
 

glance/tests/functional/v2/test_images.py

@@ -19,6 +19,7 @@ import os
 import subprocess
 import tempfile
 import time
+import urllib
 import uuid
 
 import fixtures
@@ -27,7 +28,6 @@ from oslo_serialization import jsonutils
 from oslo_utils.secretutils import md5
 from oslo_utils import units
 import requests
-from six.moves import urllib
 
 from glance.quota import keystone as ks_quota
 from glance.tests import functional

glance/tests/unit/async_/flows/test_import.py

@@ -17,11 +17,11 @@ import io
 import json
 import os
 from unittest import mock
+import urllib
 
 import glance_store
 from oslo_concurrency import processutils as putils
 from oslo_config import cfg
-from six.moves import urllib
 from taskflow import task
 from taskflow.types import failure
 

glance/tests/unit/common/scripts/image_import/test_main.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 from unittest import mock
-
-from six.moves import urllib
+import urllib
 
 import glance.common.exception as exception
 from glance.common.scripts.image_import import main as image_import_script

glance/tests/unit/common/scripts/test_scripts_utils.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 from unittest import mock
-
-from six.moves import urllib
+import urllib
 
 from glance.common import exception
 from glance.common.scripts import utils as script_utils

glance/tests/unit/utils.py

@@ -17,9 +17,9 @@
 from cryptography import exceptions as crypto_exception
 import glance_store as store
 from unittest import mock
+import urllib
 
 from oslo_config import cfg
-from six.moves import urllib
 
 from glance.common import exception
 from glance.common import store_utils