Merge "Remove log translations"

watcher/common/context.py

@@ -15,7 +15,6 @@ from oslo_log import log as logging
 from oslo_utils import timeutils
 import six
 
-from watcher._i18n import _LW
 from watcher.common import utils
 
 LOG = logging.getLogger(__name__)
@@ -65,7 +64,7 @@ class RequestContext(context.RequestContext):
         # safely ignore this as we don't use it.
         kwargs.pop('user_identity', None)
         if kwargs:
-            LOG.warning(_LW('Arguments dropped when creating context: %s'),
+            LOG.warning('Arguments dropped when creating context: %s',
                         str(kwargs))
 
         # FIXME(dims): user_id and project_id duplicate information that is

watcher/common/exception.py

@@ -29,7 +29,7 @@ from keystoneclient import exceptions as keystone_exceptions
 from oslo_log import log as logging
 import six
 
-from watcher._i18n import _, _LE
+from watcher._i18n import _
 
 from watcher import conf
 
@@ -83,9 +83,9 @@ class WatcherException(Exception):
             except Exception:
                 # kwargs doesn't match a variable in msg_fmt
                 # log the issue and the kwargs
-                LOG.exception(_LE('Exception in string format operation'))
+                LOG.exception('Exception in string format operation')
                 for name, value in kwargs.items():
-                    LOG.error(_LE("%(name)s: %(value)s"),
+                    LOG.error("%(name)s: %(value)s",
                               {'name': name, 'value': value})
 
                 if CONF.fatal_exception_format_errors:

watcher/common/rpc.py

@@ -17,7 +17,6 @@ from oslo_config import cfg
 from oslo_log import log
 import oslo_messaging as messaging
 
-from watcher._i18n import _LE
 from watcher.common import context as watcher_context
 from watcher.common import exception
 
@@ -74,7 +73,7 @@ def initialized():
 def cleanup():
     global TRANSPORT, NOTIFICATION_TRANSPORT, NOTIFIER
     if NOTIFIER is None:
-        LOG.exception(_LE("RPC cleanup: NOTIFIER is None"))
+        LOG.exception("RPC cleanup: NOTIFIER is None")
     TRANSPORT.cleanup()
     NOTIFICATION_TRANSPORT.cleanup()
     TRANSPORT = NOTIFICATION_TRANSPORT = NOTIFIER = None

watcher/common/utils.py

@@ -25,7 +25,6 @@ from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six
 
-from watcher._i18n import _LW
 from watcher.common import exception
 
 from watcher import conf
@@ -73,9 +72,9 @@ def safe_rstrip(value, chars=None):
 
     """
     if not isinstance(value, six.string_types):
-        LOG.warning(_LW(
+        LOG.warning(
             "Failed to remove trailing character. Returning original object."
-            "Supplied object is not a string: %s,"), value)
+            "Supplied object is not a string: %s,", value)
         return value
 
     return value.rstrip(chars) or value