Merge "Remove six.moves"

Author: Zuul

doc/ext/feature_matrix.py

@@ -20,11 +20,10 @@
 
 """
 
+import configparser
 import re
 import sys
 
-from six.moves import configparser
-
 from docutils import nodes
 from docutils.parsers import rst
 

nova/api/metadata/password.py

@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves import range
 from webob import exc
 
 import nova.conf

nova/api/openstack/common.py

@@ -16,11 +16,11 @@
 import collections
 import itertools
 import re
+from urllib import parse as urlparse
 
 from oslo_log import log as logging
 from oslo_utils import strutils
 import six
-import six.moves.urllib.parse as urlparse
 import webob
 from webob import exc
 

nova/api/openstack/compute/quota_sets.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_utils import strutils
+from urllib import parse as urlparse
 
-import six.moves.urllib.parse as urlparse
+from oslo_utils import strutils
 import webob
 
 from nova.api.openstack.api_version_request \

nova/api/openstack/compute/simple_tenant_usage.py

@@ -15,11 +15,11 @@
 
 import collections
 import datetime
+from urllib import parse as urlparse
 
 import iso8601
 from oslo_utils import timeutils
 import six
-import six.moves.urllib.parse as urlparse
 from webob import exc
 
 from nova.api.openstack import common

nova/cmd/manage.py

@@ -26,6 +26,7 @@
 import re
 import sys
 import traceback
+from urllib import parse as urlparse
 
 from dateutil import parser as dateutil_parser
 from keystoneauth1 import exceptions as ks_exc
@@ -40,7 +41,6 @@
 from oslo_utils import uuidutils
 import prettytable
 import six
-import six.moves.urllib.parse as urlparse
 from sqlalchemy.engine import url as sqla_url
 
 from nova.cmd import common as cmd_common

nova/compute/api.py

@@ -35,7 +35,6 @@
 from oslo_utils import units
 from oslo_utils import uuidutils
 import six
-from six.moves import range
 
 from nova.accelerator import cyborg
 from nova import availability_zones

nova/compute/manager.py

@@ -55,7 +55,6 @@
 from oslo_utils import timeutils
 from oslo_utils import units
 import six
-from six.moves import range
 
 from nova.accelerator import cyborg
 from nova import block_device

nova/conductor/manager.py

@@ -702,7 +702,7 @@ def build_instances(self, context, instances, image, filter_properties,
             return
 
         elevated = context.elevated()
-        for (instance, host_list) in six.moves.zip(instances, host_lists):
+        for (instance, host_list) in zip(instances, host_lists):
             host = host_list.pop(0)
             if is_reschedule:
                 # If this runs in the superconductor, the first instance will
@@ -1523,7 +1523,7 @@ def schedule_and_build_instances(self, context, build_requests,
         instances = []
         host_az = {}  # host=az cache to optimize multi-create
 
-        for (build_request, request_spec, host_list) in six.moves.zip(
+        for (build_request, request_spec, host_list) in zip(
                 build_requests, request_specs, host_lists):
             instance = build_request.get_new_instance(context)
             # host_list is a list of one or more Selection objects, the first
@@ -1605,8 +1605,7 @@ def schedule_and_build_instances(self, context, build_requests,
                                                   block_device_mapping, tags,
                                                   cell_mapping_cache)
 
-        zipped = six.moves.zip(build_requests, request_specs, host_lists,
-                              instances)
+        zipped = zip(build_requests, request_specs, host_lists, instances)
         for (build_request, request_spec, host_list, instance) in zipped:
             if instance is None:
                 # Skip placeholders that were buried in cell0 or had their
@@ -1758,7 +1757,7 @@ def _map_instance_to_cell(context, instance, cell):
     def _cleanup_build_artifacts(self, context, exc, instances, build_requests,
                                  request_specs, block_device_mappings, tags,
                                  cell_mapping_cache):
-        for (instance, build_request, request_spec) in six.moves.zip(
+        for (instance, build_request, request_spec) in zip(
                 instances, build_requests, request_specs):
             # Skip placeholders that were buried in cell0 or had their
             # build requests deleted by the user before instance create.

nova/console/serial.py

@@ -17,7 +17,6 @@
 import socket
 
 from oslo_log import log as logging
-import six.moves
 
 import nova.conf
 from nova import exception
@@ -45,7 +44,7 @@ def acquire_port(host):
 
     start, stop = _get_port_range()
 
-    for port in six.moves.range(start, stop):
+    for port in range(start, stop):
         if (host, port) in ALLOCATED_PORTS:
             continue
         try:

nova/console/websocketproxy.py

@@ -19,15 +19,15 @@
 '''
 
 import copy
+from http import cookies as Cookie
 import socket
 import sys
+from urllib import parse as urlparse
 
 from oslo_log import log as logging
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 import six
-from six.moves import http_cookies as Cookie
-import six.moves.urllib.parse as urlparse
 import websockify
 
 from nova.compute import rpcapi as compute_rpcapi

nova/db/sqlalchemy/api.py

@@ -35,7 +35,6 @@
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six
-from six.moves import range
 import sqlalchemy as sa
 from sqlalchemy import and_
 from sqlalchemy import Boolean

nova/image/glance.py

@@ -40,7 +40,6 @@
 from oslo_utils import excutils
 from oslo_utils import timeutils
 import six
-from six.moves import range
 
 import nova.conf
 from nova import exception

nova/network/security_group_api.py

@@ -17,6 +17,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import urllib
+
 import netaddr
 from neutronclient.common import exceptions as n_exc
 from neutronclient.neutron import v2_0 as neutronv20
@@ -26,7 +28,6 @@
 from oslo_utils import netutils
 from oslo_utils import uuidutils
 import six
-from six.moves import urllib
 from webob import exc
 
 from nova import context as nova_context

nova/objects/cell_mapping.py

@@ -10,9 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from urllib import parse as urlparse
+
 from oslo_log import log as logging
 from oslo_utils import versionutils
-import six.moves.urllib.parse as urlparse
 from sqlalchemy.sql.expression import asc
 from sqlalchemy.sql import false
 from sqlalchemy.sql import true

nova/objects/console_auth_token.py

@@ -13,12 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from urllib import parse as urlparse
+
 from oslo_db.exception import DBDuplicateEntry
 from oslo_log import log as logging
 from oslo_utils import strutils
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
-import six.moves.urllib.parse as urlparse
 
 from nova.db import api as db
 from nova import exception

nova/scheduler/filter_scheduler.py

@@ -22,7 +22,6 @@
 import random
 
 from oslo_log import log as logging
-from six.moves import range
 
 from nova.compute import utils as compute_utils
 import nova.conf

nova/scheduler/utils.py

@@ -17,12 +17,12 @@
 import collections
 import re
 import sys
+from urllib import parse
 
 import os_resource_classes as orc
 import os_traits
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
-from six.moves.urllib import parse
 
 from nova.compute import flavors
 from nova.compute import utils as compute_utils

nova/storage/rbd_utils.py

@@ -14,8 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import urllib
+
 from eventlet import tpool
-from six.moves import urllib
 
 from oslo_concurrency import processutils
 from oslo_log import log as logging

nova/test.py

@@ -24,6 +24,7 @@
 import nova.monkey_patch  # noqa
 
 import abc
+import builtins
 import collections
 import contextlib
 import copy
@@ -50,7 +51,6 @@
 from oslotest import base
 from oslotest import mock_fixture
 import six
-from six.moves import builtins
 import testtools
 
 from nova.compute import rpcapi as compute_rpcapi
@@ -903,7 +903,7 @@ def patch_open(patched_path, read_data):
     selective patching based on the path.  In this case something like
     like this may be more appropriate:
 
-        @mock.patch(six.moves.builtins, 'open')
+        @mock.patch('builtins.open')
         def test_my_code(self, mock_open):
             ...
             mock_open.assert_called_once_with(path)
@@ -916,6 +916,6 @@ def selective_fake_open(path, *args, **kwargs):
             return m(patched_path)
         return real_open(path, *args, **kwargs)
 
-    with mock.patch.object(builtins, 'open') as mock_open:
+    with mock.patch('builtins.open') as mock_open:
         mock_open.side_effect = selective_fake_open
         yield m

nova/tests/functional/api/client.py

@@ -12,10 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from urllib import parse
+
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import requests
-from six.moves.urllib import parse
 
 
 LOG = logging.getLogger(__name__)

nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 from datetime import datetime
-
-from six.moves import urllib
+import urllib
 
 from nova import context
 from nova import objects

nova/tests/functional/api_sample_tests/test_simple_tenant_usage.py

@@ -13,10 +13,10 @@
 #    under the License.
 
 import datetime
+from urllib import parse
 
 import mock
 from oslo_utils import timeutils
-from six.moves.urllib import parse
 
 from nova.tests.functional.api_sample_tests import test_servers
 import nova.tests.functional.api_samples_test_base as astb

nova/tests/functional/test_nova_manage.py

@@ -10,13 +10,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import collections
+from io import StringIO
 import mock
 
 import fixtures
 from neutronclient.common import exceptions as neutron_client_exc
 import os_resource_classes as orc
 from oslo_utils.fixture import uuidsentinel
-from six.moves import StringIO
 
 from nova.cmd import manage
 from nova import config

nova/tests/unit/api/openstack/compute/test_flavors.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from urllib import parse as urlparse
+
 import mock
-import six.moves.urllib.parse as urlparse
 import webob
 
 from nova.api.openstack import common

nova/tests/unit/api/openstack/compute/test_images.py

@@ -19,9 +19,9 @@
 """
 
 import copy
+from urllib import parse as urlparse
 
 import mock
-import six.moves.urllib.parse as urlparse
 import webob
 
 from nova.api.openstack.compute import images as images_v21

nova/tests/unit/api/openstack/compute/test_limits.py

@@ -17,11 +17,12 @@
 Tests dealing with HTTP rate-limiting.
 """
 
+from http import client as httplib
+from io import StringIO
+
 import mock
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
-from six.moves import http_client as httplib
-from six.moves import StringIO
 
 from nova.api.openstack.compute import limits as limits_v21
 from nova.api.openstack.compute import views

nova/tests/unit/api/openstack/compute/test_servers.py

@@ -19,6 +19,7 @@
 import datetime
 import ddt
 import functools
+from urllib import parse as urlparse
 
 import fixtures
 import iso8601
@@ -32,8 +33,6 @@
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six
-from six.moves import range
-import six.moves.urllib.parse as urlparse
 import testtools
 import webob