commit 5ddabc375cd366fb47bababe51ff42feef1a2737 Author: wangzihao Date: Thu Sep 24 16:03:49 2020 +0800 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 diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index 4bac2a0..b1e2c1a 100755 --- a/ceilometer/compute/virt/libvirt/inspector.py +++ b/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)) diff --git a/ceilometer/hardware/inspector/snmp.py b/ceilometer/hardware/inspector/snmp.py index cf098f2..ef74ccf 100644 --- a/ceilometer/hardware/inspector/snmp.py +++ b/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 diff --git a/ceilometer/hardware/pollsters/util.py b/ceilometer/hardware/pollsters/util.py index 68e162f..7f1a76a 100644 --- a/ceilometer/hardware/pollsters/util.py +++ b/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 diff --git a/ceilometer/network/statistics/__init__.py b/ceilometer/network/statistics/__init__.py index 488c6ed..9b5a652 100644 --- a/ceilometer/network/statistics/__init__.py +++ b/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 diff --git a/ceilometer/network/statistics/opencontrail/client.py b/ceilometer/network/statistics/opencontrail/client.py index f2f7965..0ef1d3b 100644 --- a/ceilometer/network/statistics/opencontrail/client.py +++ b/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 _ diff --git a/ceilometer/network/statistics/opencontrail/driver.py b/ceilometer/network/statistics/opencontrail/driver.py index 433b787..bf67351 100644 --- a/ceilometer/network/statistics/opencontrail/driver.py +++ b/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 diff --git a/ceilometer/network/statistics/opendaylight/driver.py b/ceilometer/network/statistics/opendaylight/driver.py index 2fe8700..193a898 100644 --- a/ceilometer/network/statistics/opendaylight/driver.py +++ b/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']: diff --git a/ceilometer/objectstore/rgw.py b/ceilometer/objectstore/rgw.py index 0fe326b..2c5cdcb 100644 --- a/ceilometer/objectstore/rgw.py +++ b/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 diff --git a/ceilometer/objectstore/rgw_client.py b/ceilometer/objectstore/rgw_client.py index daaf1ad..fbd32eb 100644 --- a/ceilometer/objectstore/rgw_client.py +++ b/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 _ diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index 06c3deb..e4d82a1 100644 --- a/ceilometer/objectstore/swift.py +++ b/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 diff --git a/ceilometer/polling/discovery/non_openstack_credentials_discovery.py b/ceilometer/polling/discovery/non_openstack_credentials_discovery.py index 956a69c..6145945 100644 --- a/ceilometer/polling/discovery/non_openstack_credentials_discovery.py +++ b/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 diff --git a/ceilometer/polling/dynamic_pollster.py b/ceilometer/polling/dynamic_pollster.py index 2918922..e11dc17 100644 --- a/ceilometer/polling/dynamic_pollster.py +++ b/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, diff --git a/ceilometer/polling/manager.py b/ceilometer/polling/manager.py index c02cdd5..3fc5c75 100644 --- a/ceilometer/polling/manager.py +++ b/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 diff --git a/ceilometer/publisher/file.py b/ceilometer/publisher/file.py index 43af7e8..b15df7f 100644 --- a/ceilometer/publisher/file.py +++ b/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 diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py index c04face..dd9e0f8 100644 --- a/ceilometer/publisher/gnocchi.py +++ b/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 diff --git a/ceilometer/publisher/http.py b/ceilometer/publisher/http.py index e5d3bec..0b90e25 100644 --- a/ceilometer/publisher/http.py +++ b/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 diff --git a/ceilometer/publisher/messaging.py b/ceilometer/publisher/messaging.py index a4e9f8a..b7abbe2 100644 --- a/ceilometer/publisher/messaging.py +++ b/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 diff --git a/ceilometer/publisher/monasca.py b/ceilometer/publisher/monasca.py index cb5ef16..9d9839f 100755 --- a/ceilometer/publisher/monasca.py +++ b/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'): diff --git a/ceilometer/publisher/zaqar.py b/ceilometer/publisher/zaqar.py index bd6eea6..1f00e9f 100644 --- a/ceilometer/publisher/zaqar.py +++ b/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 diff --git a/ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py b/ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py index d4b718c..d3db661 100644 --- a/ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py +++ b/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 diff --git a/ceilometer/tests/unit/network/statistics/opendaylight/test_client.py b/ceilometer/tests/unit/network/statistics/opendaylight/test_client.py index 2f852b0..5d36d22 100644 --- a/ceilometer/tests/unit/network/statistics/opendaylight/test_client.py +++ b/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 diff --git a/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py b/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py index 7c08dd5..c8ca5da 100644 --- a/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py +++ b/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() diff --git a/ceilometer/tests/unit/polling/test_dynamic_pollster.py b/ceilometer/tests/unit/polling/test_dynamic_pollster.py index aadb358..fa5d8ba 100644 --- a/ceilometer/tests/unit/polling/test_dynamic_pollster.py +++ b/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']) diff --git a/ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py b/ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py index ebb5421..d9ba220 100644 --- a/ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py +++ b/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} diff --git a/ceilometer/tests/unit/publisher/test_http.py b/ceilometer/tests/unit/publisher/test_http.py index d3649b4..3e1458b 100644 --- a/ceilometer/tests/unit/publisher/test_http.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_prometheus.py b/ceilometer/tests/unit/publisher/test_prometheus.py index 7c3216d..5769661 100644 --- a/ceilometer/tests/unit/publisher/test_prometheus.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_zaqar.py b/ceilometer/tests/unit/publisher/test_zaqar.py index d77728e..cf3c214 100644 --- a/ceilometer/tests/unit/publisher/test_zaqar.py +++ b/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 diff --git a/tools/send_test_data.py b/tools/send_test_data.py index dc831de..6cc8faf 100755 --- a/tools/send_test_data.py +++ b/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