Remove uses of from six.moves

We're python3 now. While we're at it, fix six.StringIO to
io.StringIO (it matched the from six grep) and reorder imports
where we're touching them anyway.

Change-Id: I02c348d497bac4cb671ce1d9e8d11274b0ee8573
This commit is contained in:
Monty Taylor 2020-03-29 10:36:09 -05:00
parent 9b253307a7
commit fe00460b99
13 changed files with 23 additions and 24 deletions

View File

@ -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(

View File

@ -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:

View File

@ -15,8 +15,8 @@
import glob
import json
import os
import urllib
from six.moves import urllib
import requests
import yaml

View File

@ -12,7 +12,7 @@
from openstack import format
from six.moves.urllib import parse
from urllib import parse
class HREFToUUID(format.Formatter):

View File

@ -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

View File

@ -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):

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -15,7 +15,7 @@ try:
JSONDecodeError = simplejson.scanner.JSONDecodeError
except ImportError:
JSONDecodeError = ValueError
from six.moves import urllib
import urllib
from keystoneauth1 import adapter

View File

@ -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')

View File

@ -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

View File

@ -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):