diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-29 12:35:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-29 12:35:45 +0000 |
| commit | 28977be7287a5ce5d85eb023da0924732675389e (patch) | |
| tree | 79e167dfdf34740c4ef50c1c2be66cc89b3aceb4 | |
| parent | 12bd40f91ddfc98ac9e8c13ee8beb6e0a50e0042 (diff) | |
| parent | 19dbcbbb896b3b3655daf4b88a4ec1ff76ae342c (diff) | |
| download | oslo-concurrency-28977be7287a5ce5d85eb023da0924732675389e.tar.gz | |
Merge "Add hacking import exception for i18n"
| -rw-r--r-- | oslo/concurrency/lockutils.py | 2 | ||||
| -rw-r--r-- | oslo/concurrency/processutils.py | 2 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/oslo/concurrency/lockutils.py b/oslo/concurrency/lockutils.py index ba98347..1b6cc1a 100644 --- a/oslo/concurrency/lockutils.py +++ b/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 diff --git a/oslo/concurrency/processutils.py b/oslo/concurrency/processutils.py index 1c4d052..95c94bb 100644 --- a/oslo/concurrency/processutils.py +++ b/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__) @@ -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 |