Merge "Add hacking import exception for i18n"

oslo/concurrency/lockutils.py

@@ -28,7 +28,7 @@ import weakref
 
 from oslo.config import cfg
 
-from oslo.concurrency._i18n import _, _LE, _LI  # noqa
+from oslo.concurrency._i18n import _, _LE, _LI
 from oslo.concurrency.openstack.common import fileutils
 
 

oslo/concurrency/processutils.py

@@ -30,7 +30,7 @@ from eventlet import greenthread
 from oslo.utils import strutils
 import six
 
-from oslo.concurrency._i18n import _  # noqa
+from oslo.concurrency._i18n import _
 
 
 LOG = logging.getLogger(__name__)

tox.ini

@@ -49,3 +49,7 @@ show-source = True
 ignore = H305,H307,H405,E126
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+
+[hacking]
+import_exceptions =
+  oslo.concurrency._i18n