Fix hacking rules: H302,H305,H307,H402

Currently, OpenStack Proposal Bot tries to update requirements with
global requirements, while the upgraded hacking has introduced some
new rules which are not fully handled by current code.

This patch fixes some simple rules which are quite straight-forward.

Change-Id: If8334f69fb1ad34fbbd6ad898e0e92eb3f81e95a

2 files changed, 6 insertions, 5 deletions

diff --git a/ceilometerclient/common/http.py b/ceilometerclient/common/http.py
index d83745b..f440abe 100644
--- a/ceilometerclient/common/http.py
+++ b/ceilometerclient/common/http.py
@@ -31,7 +31,7 @@ except ImportError:
 
 import six
 from six.moves import http_client as httplib  # noqa
-from six.moves.urllib import parse
+from six.moves import urllib
 
 from ceilometerclient import exc
 
@@ -51,7 +51,7 @@ class HTTPClient(object):
 
     @staticmethod
     def get_connection_params(endpoint, **kwargs):
-        parts = parse.urlparse(endpoint)
+        parts = urllib.parse.urlparse(endpoint)
 
         _args = (parts.hostname, parts.port, parts.path)
         _kwargs = {'timeout': (float(kwargs.get('timeout'))
@@ -75,7 +75,7 @@ class HTTPClient(object):
         _class = self.connection_params[0]
         try:
             if self.proxy_url:
-                proxy_parts = parse.urlparse(self.proxy_url)
+                proxy_parts = urllib.parse.urlparse(self.proxy_url)
                 return _class(proxy_parts.hostname, proxy_parts.port,
                               **self.connection_params[2])
             else:
@@ -212,7 +212,7 @@ class HTTPClient(object):
         return self._http_request(url, method, **kwargs)
 
     def get_proxy_url(self):
-        scheme = parse.urlparse(self.endpoint).scheme
+        scheme = urllib.parse.urlparse(self.endpoint).scheme
         if scheme == 'https':
             return os.environ.get('https_proxy')
         elif scheme == 'http':
diff --git a/ceilometerclient/common/utils.py b/ceilometerclient/common/utils.py
index 658cf7b..a6682f9 100644
--- a/ceilometerclient/common/utils.py
+++ b/ceilometerclient/common/utils.py
@@ -14,12 +14,13 @@
 #    under the License.
 
 from __future__ import print_function
-import six
+
 import sys
 import textwrap
 import uuid
 
 import prettytable
+import six
 
 from ceilometerclient import exc
 from ceilometerclient.openstack.common import cliutils