From f4b6622407d7f64ed8c340c1b82f15b18867ad02 Mon Sep 17 00:00:00 2001 From: loooosy Date: Fri, 24 Mar 2017 14:44:22 +0800 Subject: [PATCH] Remove log translations Log messages are no longer being translated. This removes all use of the _LE, _LI, and _LW translation markers to simplify logging and to avoid confusion with new contributions. See: http://lists.openstack.org/pipermail/openstack-i18n/2016-November/002574.html http://lists.openstack.org/pipermail/openstack-dev/2017-March/113365.html Change-Id: Iec2ef31f8543d51c8b6e1aed53f950800813c30b --- oslo_concurrency/_i18n.py | 10 ---------- oslo_concurrency/lockutils.py | 4 ++-- 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})