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

3 files changed, 6 insertions, 6 deletions

diff --git a/ceilometer/polling/discovery/non_openstack_credentials_discovery.py b/ceilometer/polling/discovery/non_openstack_credentials_discovery.py
index 956a69c7..61459452 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 2918922d..e11dc179 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 c02cdd50..3fc5c75d 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