diff --git a/oslo_cache/_memcache_pool.py b/oslo_cache/_memcache_pool.py index 90e9e82e..02d2ca12 100644 --- a/oslo_cache/_memcache_pool.py +++ b/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 diff --git a/oslo_cache/backends/mongo.py b/oslo_cache/backends/mongo.py index b6be9caf..515bfd9f 100644 --- a/oslo_cache/backends/mongo.py +++ b/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__ = [ diff --git a/oslo_cache/core.py b/oslo_cache/core.py index d3efba5a..8a11f130 100644 --- a/oslo_cache/core.py +++ b/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__ = [ diff --git a/tox.ini b/tox.ini index 38d665ee..2caa42d3 100644 --- a/tox.ini +++ b/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