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

11 files changed, 17 insertions, 20 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
diff --git a/ceilometerclient/tests/test_exc.py b/ceilometerclient/tests/test_exc.py
index 3cdfb85..9c8f146 100644
--- a/ceilometerclient/tests/test_exc.py
+++ b/ceilometerclient/tests/test_exc.py
@@ -16,7 +16,6 @@
 import json
 
 from ceilometerclient import exc
-
 from ceilometerclient.tests import utils
 
 HTTPEXCEPTIONS = {'HTTPBadRequest': exc.HTTPBadRequest,
diff --git a/ceilometerclient/tests/test_shell.py b/ceilometerclient/tests/test_shell.py
index a2dbc4e..be6e115 100644
--- a/ceilometerclient/tests/test_shell.py
+++ b/ceilometerclient/tests/test_shell.py
@@ -11,15 +11,14 @@
 #   under the License.
 
 import re
-import six
 import sys
 
 import fixtures
+from keystoneclient.v2_0 import client as ksclient
 import mock
+import six
 from testtools import matchers
 
-from keystoneclient.v2_0 import client as ksclient
-
 from ceilometerclient import exc
 from ceilometerclient import shell as ceilometer_shell
 from ceilometerclient.tests import utils
diff --git a/ceilometerclient/tests/test_utils.py b/ceilometerclient/tests/test_utils.py
index 8840fb8..ccace89 100644
--- a/ceilometerclient/tests/test_utils.py
+++ b/ceilometerclient/tests/test_utils.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 import itertools
+
 import mock
 import six
 
diff --git a/ceilometerclient/tests/utils.py b/ceilometerclient/tests/utils.py
index dae7ea2..a3e6a38 100644
--- a/ceilometerclient/tests/utils.py
+++ b/ceilometerclient/tests/utils.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import copy
+
 import fixtures
 import six
 import testtools
diff --git a/ceilometerclient/tests/v2/test_shell.py b/ceilometerclient/tests/v2/test_shell.py
index ebb9129..819e938 100644
--- a/ceilometerclient/tests/v2/test_shell.py
+++ b/ceilometerclient/tests/v2/test_shell.py
@@ -15,11 +15,11 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
 import re
-import six
 import sys
 
+import mock
+import six
 from testtools import matchers
 
 from ceilometerclient import shell as base_shell
diff --git a/ceilometerclient/v1/shell.py b/ceilometerclient/v1/shell.py
index 1edfc2d..efb807f 100644
--- a/ceilometerclient/v1/shell.py
+++ b/ceilometerclient/v1/shell.py
@@ -68,7 +68,7 @@ def do_sample_list(cc, args):
 @utils.arg('-p', '--project_id', metavar='<PROJECT_ID>',
            help='ID of the project to show samples for.')
 def do_meter_list(cc, args={}):
-    '''List the user's meter'''
+    '''List the user's meter.'''
     fields = {'resource_id': args.resource_id,
               'user_id': args.user_id,
               'project_id': args.project_id,
diff --git a/ceilometerclient/v2/options.py b/ceilometerclient/v2/options.py
index 775ac40..ee85c42 100644
--- a/ceilometerclient/v2/options.py
+++ b/ceilometerclient/v2/options.py
@@ -13,7 +13,7 @@
 
 import re
 
-from six.moves.urllib import parse
+from six.moves import urllib
 
 OP_LOOKUP = {'!=': 'ne',
              '>=': 'ge',
@@ -54,7 +54,7 @@ def build_url(path, q, params=None):
         # Transform the dict to a sequence of two-element tuples in fixed
         # order, then the encoded string will be consistent in Python 2&3.
         new_qparams = sorted(query_params.items(), key=lambda x: x[0])
-        path += "?" + parse.urlencode(new_qparams, doseq=True)
+        path += "?" + urllib.parse.urlencode(new_qparams, doseq=True)
 
         if params:
             for p in params:
diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py
index c603814..41fba5d 100644
--- a/ceilometerclient/v2/shell.py
+++ b/ceilometerclient/v2/shell.py
@@ -21,6 +21,7 @@
 
 import functools
 import json
+
 import six
 
 from ceilometerclient.common import utils
diff --git a/tox.ini b/tox.ini
index 175248a..dbfefa0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,12 +25,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 commands = {posargs}
 
 [flake8]
-# H302 import only modules
-# H305 imports not grouped correctly
-# H307 like imports should be grouped together
-# H402 one line docstring needs punctuation
 # H405 multi line docstring summary not separated with an empty line
 # H904 Wrap long lines in parentheses instead of a backslash
-ignore = H302,H305,H307,H402,H405,H904
+ignore = H405,H904
 show-source = True
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools