Remove six.moves

Remove six.moves Replace the following items with Python 3 style code.
- six.moves.urllib
- six.moves.xrange
- six.moves.range

urlparse instead of url_parse

Change-Id: I2a66e69d7c1401d0bbdb9d8e8b0a7b5400aee6d2

ceilometer/compute/virt/libvirt/inspector.py

@@ -202,7 +202,7 @@ class LibvirtInspector(virt_inspector.Inspector):
         # have holes according to
         # https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/libvirt-domain.c
         # virConnectGetAllDomainStats()
-        for vcpu in six.moves.range(stats.get('vcpu.maximum', 0)):
+        for vcpu in range(stats.get('vcpu.maximum', 0)):
             try:
                 cpu_time += (stats.get('vcpu.%s.time' % vcpu) +
                              stats.get('vcpu.%s.wait' % vcpu))

ceilometer/hardware/inspector/snmp.py

@@ -21,7 +21,8 @@ from oslo_log import log
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 from pysnmp.proto import rfc1905
 import six
-import six.moves.urllib.parse as urlparse
+
+from urllib import parse as urlparse
 
 from ceilometer.hardware.inspector import base
 

ceilometer/hardware/pollsters/util.py

@@ -16,7 +16,7 @@
 
 import copy
 
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer import sample
 

ceilometer/network/statistics/__init__.py

@@ -17,8 +17,8 @@ import abc
 
 from oslo_utils import netutils
 import six
-from six.moves.urllib import parse as urlparse
 from stevedore import driver as _driver
+from urllib import parse as urlparse
 
 from ceilometer.polling import plugin_base
 from ceilometer import sample

ceilometer/network/statistics/opencontrail/client.py

@@ -17,7 +17,7 @@ import copy
 from oslo_log import log
 import requests
 import six
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.i18n import _
 

ceilometer/network/statistics/opencontrail/driver.py

@@ -14,7 +14,7 @@
 
 import re
 
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.network.statistics import driver
 from ceilometer.network.statistics.opencontrail import client

ceilometer/network/statistics/opendaylight/driver.py

@@ -15,8 +15,7 @@
 
 from oslo_log import log
 import six
-from six import moves
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.network.statistics import driver
 from ceilometer.network.statistics.opendaylight import client
@@ -284,7 +283,7 @@ class OpenDayLightDriver(driver.Driver):
             break
 
         # link status to hosts
-        for hosts, status in moves.zip(
+        for hosts, status in zip(
                 [data['active_hosts'], data['inactive_hosts']],
                 ['active', 'inactive']):
             for host_config in hosts['hostConfig']:

ceilometer/objectstore/rgw.py

@@ -18,7 +18,7 @@
 from keystoneauth1 import exceptions
 from oslo_config import cfg
 from oslo_log import log
-import six.moves.urllib.parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer import keystone_client
 from ceilometer.polling import plugin_base

ceilometer/objectstore/rgw_client.py

@@ -18,7 +18,8 @@ from collections import namedtuple
 
 from awsauth import S3Auth
 import requests
-import six.moves.urllib.parse as urlparse
+
+from urllib import parse as urlparse
 
 from ceilometer.i18n import _
 

ceilometer/objectstore/swift.py

@@ -18,9 +18,9 @@
 from keystoneauth1 import exceptions
 from oslo_config import cfg
 from oslo_log import log
-import six.moves.urllib.parse as urlparse
 from swiftclient import client as swift
 from swiftclient.exceptions import ClientException
+from urllib import parse as urlparse
 
 from ceilometer import keystone_client
 from ceilometer.polling import plugin_base

ceilometer/polling/discovery/non_openstack_credentials_discovery.py

@@ -16,7 +16,7 @@ from oslo_log import log
 
 from ceilometer.polling.discovery.endpoint import EndpointDiscovery
 
-import six.moves.urllib.parse as urlparse
+from urllib import parse as urlparse
 
 import requests
 

ceilometer/polling/dynamic_pollster.py

@@ -33,7 +33,7 @@ from functools import reduce
 import operator
 import requests
 
-from six.moves.urllib import parse as url_parse
+from urllib import parse as urlparse
 
 LOG = log.getLogger(__name__)
 
@@ -623,14 +623,14 @@ class PollsterSampleGatherer(object):
             kwargs, self.definitions.configurations['url_path'])
 
     def get_next_page_url(self, kwargs, next_sample_url):
-        parse_result = url_parse.urlparse(next_sample_url)
+        parse_result = urlparse.urlparse(next_sample_url)
         if parse_result.netloc:
             return next_sample_url
         return self.get_request_url(kwargs, next_sample_url)
 
     def get_request_url(self, kwargs, url_path):
         endpoint = kwargs['resource']
-        return url_parse.urljoin(endpoint, url_path)
+        return urlparse.urljoin(endpoint, url_path)
 
     def retrieve_entries_from_response(self, response_json):
         if isinstance(response_json, list):
@@ -724,7 +724,7 @@ class NonOpenStackApisSamplesGatherer(PollsterSampleGatherer):
         endpoint = self.definitions.configurations['url_path']
         if endpoint == url_path:
             return url_path
-        return url_parse.urljoin(endpoint, url_path)
+        return urlparse.urljoin(endpoint, url_path)
 
     def execute_request_get_samples(self, **kwargs):
         samples = super(NonOpenStackApisSamplesGatherer,

ceilometer/polling/manager.py

@@ -31,9 +31,9 @@ from oslo_log import log
 import oslo_messaging
 from oslo_utils import timeutils
 import six
-from six.moves.urllib import parse as urlparse
 from stevedore import extension
 from tooz import coordination
+from urllib import parse as urlparse
 
 from ceilometer import agent
 from ceilometer import declarative

ceilometer/publisher/file.py

@@ -18,7 +18,7 @@ import logging
 import logging.handlers
 
 from oslo_log import log
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer import publisher
 

ceilometer/publisher/gnocchi.py

@@ -27,8 +27,8 @@ from oslo_log import log
 from oslo_utils import fnmatch
 from oslo_utils import timeutils
 import six
-import six.moves.urllib.parse as urlparse
 from stevedore import extension
+from urllib import parse as urlparse
 
 from ceilometer import declarative
 from ceilometer import gnocchi_client

ceilometer/publisher/http.py

@@ -19,7 +19,7 @@ from oslo_log import log
 from oslo_utils import strutils
 import requests
 from requests import adapters
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer import publisher
 

ceilometer/publisher/messaging.py

@@ -26,7 +26,7 @@ import oslo_messaging
 from oslo_utils import encodeutils
 from oslo_utils import excutils
 import six
-import six.moves.urllib.parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.i18n import _
 from ceilometer import messaging

ceilometer/publisher/monasca.py

@@ -21,7 +21,6 @@ import threading
 import time
 
 from oslo_log import log
-from six import moves
 
 import ceilometer
 from ceilometer import monasca_client as mon_client
@@ -201,7 +200,7 @@ class MonascaPublisher(publisher.ConfigPublisherBase):
 
             # Iterate over the retry_queue to eliminate
             # metrics that have maxed out their retry attempts
-            for ctr in moves.xrange(retry_count):
+            for ctr in range(retry_count):
                 if self.retry_counter[ctr] > self.conf.\
                         monasca.batch_max_retries:
                     if hasattr(self, 'archive_handler'):

ceilometer/publisher/zaqar.py

@@ -11,7 +11,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer import keystone_client
 from ceilometer import publisher

ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py

@@ -15,7 +15,7 @@
 from unittest import mock
 
 from oslotest import base
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.network.statistics.opencontrail import driver
 from ceilometer import service

ceilometer/tests/unit/network/statistics/opendaylight/test_client.py

@@ -18,7 +18,7 @@ from oslo_config import fixture as config_fixture
 from oslotest import base
 from requests import auth as req_auth
 import six
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.i18n import _
 from ceilometer.network.statistics.opendaylight import client

ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py

@@ -17,7 +17,7 @@ from unittest import mock
 
 from oslotest import base
 import six
-from six.moves.urllib import parse as url_parse
+from urllib import parse as urlparse
 
 from ceilometer.network.statistics.opendaylight import driver
 from ceilometer import service
@@ -58,20 +58,20 @@ class _Base(base.BaseTestCase):
     def inactive_hosts_data(self):
         pass
 
-    fake_odl_url = url_parse.ParseResult('opendaylight',
-                                         'localhost:8080',
-                                         'controller/nb/v2',
-                                         None,
-                                         None,
-                                         None)
+    fake_odl_url = urlparse.ParseResult('opendaylight',
+                                        'localhost:8080',
+                                        'controller/nb/v2',
+                                        None,
+                                        None,
+                                        None)
 
-    fake_params = url_parse.parse_qs('user=admin&password=admin&scheme=http&'
-                                     'container_name=default&auth=basic')
+    fake_params = urlparse.parse_qs('user=admin&password=admin&scheme=http&'
+                                    'container_name=default&auth=basic')
 
     fake_params_multi_container = (
-        url_parse.parse_qs('user=admin&password=admin&scheme=http&'
-                           'container_name=first&container_name=second&'
-                           'auth=basic'))
+        urlparse.parse_qs('user=admin&password=admin&scheme=http&'
+                          'container_name=first&container_name=second&'
+                          'auth=basic'))
 
     def setUp(self):
         super(_Base, self).setUp()

ceilometer/tests/unit/polling/test_dynamic_pollster.py

@@ -18,7 +18,7 @@ import logging
 from unittest import mock
 
 import requests
-from six.moves.urllib import parse as url_parse
+from urllib import parse as urlparse
 
 from ceilometer.declarative import DynamicPollsterDefinitionException
 from ceilometer.polling import dynamic_pollster
@@ -896,7 +896,7 @@ class TestDynamicPollster(base.BaseTestCase):
             self.pollster_definition_only_required_fields)
 
         base_url = "http://test.com/something_that_we_do_not_care"
-        expected_url = url_parse.urljoin(
+        expected_url = urlparse.urljoin(
             base_url, self.pollster_definition_only_required_fields[
                 'url_path'])
 

ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py

@@ -20,7 +20,7 @@ from unittest import mock
 
 from oslotest import base
 import requests
-from six.moves.urllib import parse as url_parse
+from urllib import parse as urlparse
 
 from ceilometer.declarative import DynamicPollsterDefinitionException
 from ceilometer.declarative import NonOpenStackApisDynamicPollsterException
@@ -456,7 +456,7 @@ class TestNonOpenStackApisDynamicPollster(base.BaseTestCase):
 
         base_url = self.pollster_definition_only_required_fields['url_path']
         next_sample_path = "/next_page"
-        expected_url = url_parse.urljoin(base_url, next_sample_path)
+        expected_url = urlparse.urljoin(base_url, next_sample_path)
 
         kwargs = {'next_sample_url': expected_url}
 
@@ -471,7 +471,7 @@ class TestNonOpenStackApisDynamicPollster(base.BaseTestCase):
 
         base_url = self.pollster_definition_only_required_fields['url_path']
         next_sample_path = "/next_page"
-        expected_url = url_parse.urljoin(base_url, next_sample_path)
+        expected_url = urlparse.urljoin(base_url, next_sample_path)
 
         kwargs = {'next_sample_url': next_sample_path}
 

ceilometer/tests/unit/publisher/test_http.py

@@ -20,7 +20,7 @@ import uuid
 
 from oslotest import base
 import requests
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.event import models as event
 from ceilometer.publisher import http

ceilometer/tests/unit/publisher/test_prometheus.py

@@ -20,7 +20,7 @@ import uuid
 
 from oslotest import base
 import requests
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.publisher import prometheus
 from ceilometer import sample

ceilometer/tests/unit/publisher/test_zaqar.py

@@ -16,7 +16,7 @@ from unittest import mock
 import uuid
 
 from oslotest import base
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ceilometer.event import models as event
 from ceilometer.publisher import zaqar

tools/send_test_data.py

@@ -30,7 +30,6 @@ import uuid
 
 import make_test_data
 import oslo_messaging
-from six import moves
 
 from ceilometer import messaging
 from ceilometer.publisher import utils
@@ -59,7 +58,7 @@ def generate_data(conf, send_batch, make_data_args, samples_count,
 
     make_data_args.resource_id = None
     resources_list = [str(uuid.uuid4())
-                      for _ in moves.xrange(resources_count)]
+                      for _ in range(resources_count)]
     resource_samples = {resource: 0 for resource in resources_list}
     batch = []
     count = 0