summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-12 21:13:07 +0000
committerGerrit Code Review <review@openstack.org>2017-07-12 21:13:07 +0000
commit88583edbb478c1a157b58c95c231a0b5a741b78a (patch)
treec2b8d7c8b2713f20903aab6dc9399c796b85fb75
parent9edbb5f44a4ece6e6e4a5f371ca90e85beed3002 (diff)
parentf4b6622407d7f64ed8c340c1b82f15b18867ad02 (diff)
downloadoslo-concurrency-88583edbb478c1a157b58c95c231a0b5a741b78a.tar.gz
Merge "Remove log translations"3.21.0
-rw-r--r--oslo_concurrency/_i18n.py10
-rw-r--r--oslo_concurrency/lockutils.py4
2 files changed, 2 insertions, 12 deletions
diff --git a/oslo_concurrency/_i18n.py b/oslo_concurrency/_i18n.py
index 7524106..d8ca6c0 100644
--- a/oslo_concurrency/_i18n.py
+++ b/oslo_concurrency/_i18n.py
@@ -20,13 +20,3 @@ _translators = oslo_i18n.TranslatorFactory(domain='oslo_concurrency')
# The primary translation function using the well-known name "_"
_ = _translators.primary
-
-# Translators for log levels.
-#
-# The abbreviated names are meant to reflect the usual use of a short
-# name like '_'. The "L" is for "log" and the other letter comes from
-# the level.
-_LI = _translators.log_info
-_LW = _translators.log_warning
-_LE = _translators.log_error
-_LC = _translators.log_critical
diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py
index ea67571..becda88 100644
--- a/oslo_concurrency/lockutils.py
+++ b/oslo_concurrency/lockutils.py
@@ -30,7 +30,7 @@ from oslo_utils import reflection
from oslo_utils import timeutils
import six
-from oslo_concurrency._i18n import _, _LI
+from oslo_concurrency._i18n import _
LOG = logging.getLogger(__name__)
@@ -158,7 +158,7 @@ def remove_external_lock_file(name, lock_file_prefix=None, lock_path=None,
try:
os.remove(lock_file_path)
except OSError:
- LOG.info(_LI('Failed to remove file %(file)s'),
+ LOG.info('Failed to remove file %(file)s',
{'file': lock_file_path})