diff options
| author | wingwj <wingwj@gmail.com> | 2017-03-21 12:55:27 +0800 |
|---|---|---|
| committer | wingwj <wingwj@gmail.com> | 2017-03-21 14:38:05 +0800 |
| commit | 1d5774f4983e915f45787e7afd2d290f65cf428c (patch) | |
| tree | 698ad4790a77991125bebbea3f27d2e3c700afc4 /keystoneclient/auth | |
| parent | 5cd7f5c8735544b3faca9763298e3389733a8633 (diff) | |
| download | python-keystoneclient-1d5774f4983e915f45787e7afd2d290f65cf428c.tar.gz | |
Remove log translations in python-keystoneclient
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: Ia77819cbb133903d20e821bff0c45766b11ef07b
Diffstat (limited to 'keystoneclient/auth')
| -rw-r--r-- | keystoneclient/auth/identity/base.py | 10 | ||||
| -rw-r--r-- | keystoneclient/auth/identity/generic/base.py | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/keystoneclient/auth/identity/base.py b/keystoneclient/auth/identity/base.py index 29ab121..b20d3e2 100644 --- a/keystoneclient/auth/identity/base.py +++ b/keystoneclient/auth/identity/base.py @@ -22,7 +22,6 @@ import six from keystoneclient import _discover from keystoneclient.auth import base from keystoneclient import exceptions -from keystoneclient.i18n import _LW LOG = logging.getLogger(__name__) @@ -317,10 +316,10 @@ class BaseIdentityPlugin(base.BaseAuthPlugin): else: if not service_type: - LOG.warning(_LW( + LOG.warning( 'Plugin cannot return an endpoint without knowing the ' 'service type that is required. Add service_type to ' - 'endpoint filtering data.')) + 'endpoint filtering data.') return None if not interface: @@ -353,10 +352,9 @@ class BaseIdentityPlugin(base.BaseAuthPlugin): # NOTE(jamielennox): Again if we can't contact the server we fall # back to just returning the URL from the catalog. This may not be # the best default but we need it for now. - LOG.warning(_LW( + LOG.warning( 'Failed to contact the endpoint at %s for discovery. Fallback ' - 'to using that endpoint as the base url.'), - url) + 'to using that endpoint as the base url.', url) else: url = disc.url_for(version) diff --git a/keystoneclient/auth/identity/generic/base.py b/keystoneclient/auth/identity/generic/base.py index 85207ac..98680ef 100644 --- a/keystoneclient/auth/identity/generic/base.py +++ b/keystoneclient/auth/identity/generic/base.py @@ -20,7 +20,7 @@ import six.moves.urllib.parse as urlparse from keystoneclient import _discover from keystoneclient.auth.identity import base from keystoneclient import exceptions -from keystoneclient.i18n import _, _LW +from keystoneclient.i18n import _ LOG = logging.getLogger(__name__) @@ -140,9 +140,9 @@ class BaseGenericPlugin(base.BaseIdentityPlugin): except (exceptions.DiscoveryFailure, exceptions.HTTPError, exceptions.ConnectionError): - LOG.warning(_LW('Discovering versions from the identity service ' - 'failed when creating the password plugin. ' - 'Attempting to determine version from URL.')) + LOG.warning('Discovering versions from the identity service ' + 'failed when creating the password plugin. ' + 'Attempting to determine version from URL.') url_parts = urlparse.urlparse(self.auth_url) path = url_parts.path.lower() |