Merge "flake8 - remove unused rules and fix imports"

oslo_cache/_memcache_pool.py

@@ -27,7 +27,8 @@ import time
 
 import memcache
 from oslo_log import log
-from six.moves import queue, zip
+from six.moves import queue
+from six.moves import zip
 
 from oslo_cache._i18n import _
 from oslo_cache import exception

oslo_cache/backends/mongo.py

@@ -23,8 +23,9 @@ from oslo_utils import importutils
 from oslo_utils import timeutils
 import six
 
+from oslo_cache._i18n import _
+from oslo_cache._i18n import _LW
 from oslo_cache import exception
-from oslo_cache._i18n import _, _LW
 
 
 __all__ = [

oslo_cache/core.py

@@ -42,9 +42,10 @@ from dogpile.cache import util
 from oslo_log import log
 from oslo_utils import importutils
 
-from oslo_cache import exception
-from oslo_cache._i18n import _, _LE
+from oslo_cache._i18n import _
+from oslo_cache._i18n import _LE
 from oslo_cache import _opts
+from oslo_cache import exception
 
 
 __all__ = [

tox.ini

@@ -29,10 +29,8 @@ commands = python setup.py build_sphinx
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [flake8]
-# E123, E125 skipped as they are invalid PEP-8.
-
 show-source = True
-ignore = E123,E125,H301,H405
+ignore = H405
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build