Enabled hacking checks H305 and H307

* H305  imports not grouped correctly
* H307  like imports should be grouped together

Change-Id: I23fdad285508707a2c1d7c832ff8b1a6a10e8f88

novaclient/tests/test_auth_plugins.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import argparse
+
 import mock
 import pkg_resources
 import requests

novaclient/tests/test_client.py

@@ -14,11 +14,12 @@
 #    under the License.
 
 
+import json
 import logging
-import mock
-import requests
 
 import fixtures
+import mock
+import requests
 
 import novaclient.client
 import novaclient.extension
@@ -27,8 +28,6 @@ from novaclient.tests import utils
 import novaclient.v1_1.client
 import novaclient.v3.client
 
-import json
-
 
 class ClientConnectionPoolTest(utils.TestCase):
 

novaclient/tests/test_shell.py

@@ -11,15 +11,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import prettytable
-import re
-import six
-import sys
-
 from distutils.version import StrictVersion
+import re
+import sys
 
 import fixtures
 import mock
+import prettytable
+import six
 from testtools import matchers
 
 import novaclient.client

novaclient/tests/v1_1/contrib/test_baremetal.py

@@ -15,10 +15,9 @@
 
 
 from novaclient import extension
-from novaclient.v1_1.contrib import baremetal
-
 from novaclient.tests import utils
 from novaclient.tests.v1_1.contrib import fakes
+from novaclient.v1_1.contrib import baremetal
 
 
 extensions = [

novaclient/tests/v1_1/contrib/test_instance_actions.py

@@ -12,11 +12,11 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from novaclient import extension
-from novaclient.v1_1.contrib import instance_action
 
+from novaclient import extension
 from novaclient.tests import utils
 from novaclient.tests.v1_1.contrib import fakes
+from novaclient.v1_1.contrib import instance_action
 
 
 extensions = [

novaclient/tests/v1_1/contrib/test_list_extensions.py

@@ -12,10 +12,9 @@
 #    under the License.
 
 from novaclient import extension
-from novaclient.v1_1.contrib import list_extensions
-
 from novaclient.tests import utils
 from novaclient.tests.v1_1 import fakes
+from novaclient.v1_1.contrib import list_extensions
 
 
 extensions = [

novaclient/tests/v1_1/contrib/test_tenant_networks.py

@@ -14,10 +14,9 @@
 #    under the License.
 
 from novaclient import extension
-from novaclient.v1_1.contrib import tenant_networks
-
 from novaclient.tests import utils
 from novaclient.tests.v1_1.contrib import fakes
+from novaclient.v1_1.contrib import tenant_networks
 
 
 extensions = [

novaclient/utils.py

@@ -12,12 +12,12 @@
 #    under the License.
 
 import json
-import pkg_resources
 import re
 import sys
 import textwrap
 import uuid
 
+import pkg_resources
 import prettytable
 import six
 

tox.ini

@@ -27,7 +27,7 @@ downloadcache = ~/cache/pip
 
 [flake8]
 # TODO fix following rules from hacking 0.9
-# E131,E265,H233,H305,H307,H402,H405,H904
-ignore = E12,E131,E265,F811,F821,H233,H302,H305,H307,H402,H404,H405,H904
+# E131,E265,H233,H402,H405,H904
+ignore = E12,E131,E265,F811,F821,H233,H302,H402,H404,H405,H904
 show-source = True
 exclude=.venv,.git,.tox,dist,*openstack/common*,*lib/python*,*egg,build