diff --git a/openstack/cloud/_object_store.py b/openstack/cloud/_object_store.py index c781e16c9..736d22b4d 100644 --- a/openstack/cloud/_object_store.py +++ b/openstack/cloud/_object_store.py @@ -20,8 +20,7 @@ import json import os import six import types # noqa - -from six.moves import urllib_parse +import urllib.parse import keystoneauth1.exceptions @@ -242,7 +241,7 @@ class ObjectStoreCloudMixin(_normalize.Normalizer): # The endpoint in the catalog has version and project-id in it # To get capabilities, we have to disassemble and reassemble the URL # This logic is taken from swiftclient - endpoint = urllib_parse.urlparse(self.object_store.get_endpoint()) + endpoint = urllib.parse.urlparse(self.object_store.get_endpoint()) url = "{scheme}://{netloc}/info".format( scheme=endpoint.scheme, netloc=endpoint.netloc) @@ -753,11 +752,11 @@ class ObjectStoreCloudMixin(_normalize.Normalizer): return self._object_store_client.get(endpoint, stream=stream) def _get_object_endpoint(self, container, obj=None, query_string=None): - endpoint = urllib_parse.quote(container) + endpoint = urllib.parse.quote(container) if obj: endpoint = '{endpoint}/{object}'.format( endpoint=endpoint, - object=urllib_parse.quote(obj) + object=urllib.parse.quote(obj) ) if query_string: endpoint = '{endpoint}?{query_string}'.format( diff --git a/openstack/config/cloud_region.py b/openstack/config/cloud_region.py index 96a126381..41bcc9d5d 100644 --- a/openstack/config/cloud_region.py +++ b/openstack/config/cloud_region.py @@ -14,6 +14,7 @@ import copy import warnings +import urllib from keystoneauth1 import discover import keystoneauth1.exceptions.catalog @@ -21,7 +22,6 @@ from keystoneauth1.loading import adapter as ks_load_adap from keystoneauth1 import session as ks_session import os_service_types import requestsexceptions -from six.moves import urllib try: import statsd except ImportError: diff --git a/openstack/config/vendors/__init__.py b/openstack/config/vendors/__init__.py index 41badf54b..0c0bbf80a 100644 --- a/openstack/config/vendors/__init__.py +++ b/openstack/config/vendors/__init__.py @@ -15,8 +15,8 @@ import glob import json import os +import urllib -from six.moves import urllib import requests import yaml diff --git a/openstack/key_manager/v1/_format.py b/openstack/key_manager/v1/_format.py index 34698a389..4ff41efde 100644 --- a/openstack/key_manager/v1/_format.py +++ b/openstack/key_manager/v1/_format.py @@ -12,7 +12,7 @@ from openstack import format -from six.moves.urllib import parse +from urllib import parse class HREFToUUID(format.Formatter): diff --git a/openstack/object_store/v1/_proxy.py b/openstack/object_store/v1/_proxy.py index eba059e6a..6a0b00dd3 100644 --- a/openstack/object_store/v1/_proxy.py +++ b/openstack/object_store/v1/_proxy.py @@ -17,9 +17,9 @@ import hmac import json import os import time +from urllib import parse import six -from six.moves.urllib import parse from openstack.object_store.v1 import account as _account from openstack.object_store.v1 import container as _container diff --git a/openstack/object_store/v1/info.py b/openstack/object_store/v1/info.py index f5fbde39b..3948b2140 100644 --- a/openstack/object_store/v1/info.py +++ b/openstack/object_store/v1/info.py @@ -11,11 +11,11 @@ # License for the specific language governing permissions and limitations # under the License. +import urllib + from openstack import exceptions from openstack import resource -from six.moves import urllib - class Info(resource.Resource): diff --git a/openstack/orchestration/util/template_utils.py b/openstack/orchestration/util/template_utils.py index 8b0070c0d..7b0ee6233 100644 --- a/openstack/orchestration/util/template_utils.py +++ b/openstack/orchestration/util/template_utils.py @@ -15,8 +15,8 @@ import collections import json import six -from six.moves.urllib import parse -from six.moves.urllib import request +from urllib import parse +from urllib import request from openstack.orchestration.util import environment_format from openstack.orchestration.util import template_format diff --git a/openstack/orchestration/util/utils.py b/openstack/orchestration/util/utils.py index 89a04b8eb..2c2b3d610 100644 --- a/openstack/orchestration/util/utils.py +++ b/openstack/orchestration/util/utils.py @@ -15,10 +15,9 @@ import base64 import os - -from six.moves.urllib import error -from six.moves.urllib import parse -from six.moves.urllib import request +from urllib import error +from urllib import parse +from urllib import request from openstack import exceptions diff --git a/openstack/orchestration/v1/template.py b/openstack/orchestration/v1/template.py index ab0bc5655..818e73992 100644 --- a/openstack/orchestration/v1/template.py +++ b/openstack/orchestration/v1/template.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves.urllib import parse +from urllib import parse from openstack import resource diff --git a/openstack/proxy.py b/openstack/proxy.py index 6c1456ab9..dbb246399 100644 --- a/openstack/proxy.py +++ b/openstack/proxy.py @@ -15,7 +15,7 @@ try: JSONDecodeError = simplejson.scanner.JSONDecodeError except ImportError: JSONDecodeError = ValueError -from six.moves import urllib +import urllib from keystoneauth1 import adapter diff --git a/openstack/tests/base.py b/openstack/tests/base.py index 6f381a677..5ee5ae688 100644 --- a/openstack/tests/base.py +++ b/openstack/tests/base.py @@ -17,11 +17,11 @@ import os import sys import fixtures +from io import StringIO import logging import munch from oslotest import base import pprint -from six import StringIO import testtools.content _TRUE_VALUES = ('true', '1', 'yes') diff --git a/openstack/tests/unit/base.py b/openstack/tests/unit/base.py index a4db4be69..d0eef6ed7 100644 --- a/openstack/tests/unit/base.py +++ b/openstack/tests/unit/base.py @@ -15,8 +15,10 @@ import collections import os +import tempfile import time import uuid +import urllib import fixtures from keystoneauth1 import loading as ks_loading @@ -24,8 +26,6 @@ import openstack.config as occ from oslo_config import cfg from requests import structures from requests_mock.contrib import fixture as rm_fixture -from six.moves import urllib -import tempfile import openstack.cloud import openstack.connection diff --git a/tools/keystone_version.py b/tools/keystone_version.py index 663e6c878..df8fadcd2 100644 --- a/tools/keystone_version.py +++ b/tools/keystone_version.py @@ -13,10 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import openstack.config import pprint import sys -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse + +import openstack.config def print_versions(r):