openstack
/
python-novaclient
Code Issues Proposed changes

Merge "debug level logs should not be translated"

This commit is contained in:
Jenkins 2014-05-17 23:12:29 +00:00 committed by Gerrit Code Review
parent 076c1a004a 22277e6d0b
commit 73dcda4fce
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
novaclient/auth_plugin.py
View File

@ -20,7 +20,6 @@ import pkg_resources
import six
from novaclient import exceptions
from novaclient.openstack.common.gettextutils import _
from novaclient import utils
@ -40,7 +39,7 @@ def discover_auth_systems():
try:
auth_plugin = ep.load()
except (ImportError, pkg_resources.UnknownExtra, AttributeError) as e:
logger.debug(_("ERROR: Cannot load auth plugin %s") % ep.name)
logger.debug("ERROR: Cannot load auth plugin %s" % ep.name)
logger.debug(e, exc_info=1)
else:
_discovered_plugins[ep.name] = auth_plugin

10
novaclient/client.py
View File

@ -183,10 +183,10 @@ class HTTPClient(object):
def http_log_resp(self, resp):
if not self.http_log_debug:
return
self._logger.debug(_("RESP: [%(status)s] %(headers)s\nRESP BODY: "
"%(text)s\n"), {'status': resp.status_code,
'headers': resp.headers,
'text': resp.text})
self._logger.debug("RESP: [%(status)s] %(headers)s\nRESP BODY: "
"%(text)s\n", {'status': resp.status_code,
'headers': resp.headers,
'text': resp.text})
def open_session(self):
if not self._connection_pool:
@ -375,7 +375,7 @@ class HTTPClient(object):
# GET ...:5001/v2.0/tokens/#####/endpoints
url = '/'.join([url, 'tokens', '%s?belongsTo=%s'
% (self.proxy_token, self.proxy_tenant_id)])
self._logger.debug(_("Using Endpoint URL: %s") % url)
self._logger.debug("Using Endpoint URL: %s" % url)
resp, body = self._time_request(
url, "GET", headers={'X-Auth-Token': self.auth_token})
return self._extract_service_catalog(url, resp, body,