Merge "Fix and re-gate on H306"

nova/db/sqlalchemy/types.py

@@ -15,8 +15,8 @@
 
 """Custom SQLAlchemy types."""
 
-from oslo.utils import netutils
 import netaddr
+from oslo.utils import netutils
 from sqlalchemy.dialects import postgresql
 from sqlalchemy import types
 

nova/test.py

@@ -26,8 +26,8 @@ eventlet.monkey_patch(os=False)
 
 import copy
 import inspect
-import mock
 import logging
+import mock
 import os
 
 import fixtures

nova/tests/fixtures.py

@@ -26,9 +26,10 @@ import warnings
 import fixtures
 from oslo.config import cfg
 from oslo.messaging import conffixture as messaging_conffixture
+
 from nova.db import migration
-from nova import rpc
 from nova.db.sqlalchemy import api as session
+from nova import rpc
 from nova import service
 
 _TRUE_VALUES = ('True', 'true', '1', 'yes')

tox.ini

@@ -67,10 +67,9 @@ commands = python setup.py build_sphinx
 # New from hacking 0.9: E129, E131, H407, H405
 # E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301
 # New from hacking 0.10: H238
-# H306 was mistakenly ignored, TODO to re-add
 # Temporarily skip W292 (new in hacking 0.10)
 
-ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,H238,H306,W292
+ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,H238,W292
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools/xenserver*
 # To get a list of functions that are more complex than 25, set max-complexity
 # to 25 and run 'tox -epep8'.