openstack/python-glanceclient
Code Issues Proposed changes

cleanup openstack-common.conf and sync updated files

Browse Source 
periodic updates of latest from oslo-incubator. please
note that files no longer on oslo-incubator mean that
they have been moved to oslo.* libraries. So there's
more work needed to remove these files and switch
to appropriate libraries

Change-Id: Icd71b4b1ea9f1df526614a29277f25a7ab47b721
This commit is contained in:
Davanum Srinivas 2015-06-07 10:11:48 -04:00 committed by Davanum Srinivas (dims)
parent dfa98ab04c
commit 5e85d61fb9
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glanceclient/openstack/common/_i18n.py
View File

@ -17,14 +17,14 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
""" """
try: try:
import oslo.i18n import oslo_i18n
# NOTE(dhellmann): This reference to o-s-l-o will be replaced by the # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
# application name when this module is synced into the separate # application name when this module is synced into the separate
# repository. It is OK to have more than one translation function # repository. It is OK to have more than one translation function
# using the same domain, since there will still only be one message # using the same domain, since there will still only be one message
# catalog. # catalog.
_translators = oslo.i18n.TranslatorFactory(domain='glanceclient') _translators = oslo_i18n.TranslatorFactory(domain='glanceclient')
# The primary translation function using the well-known name "_" # The primary translation function using the well-known name "_"
_ = _translators.primary _ = _translators.primary

2
glanceclient/openstack/common/apiclient/base.py
View File

@ -402,7 +402,7 @@ class CrudManager(BaseManager):
'name': self.resource_class.__name__, 'name': self.resource_class.__name__,
'args': kwargs 'args': kwargs
} }
raise exceptions.NotFound(404, msg) raise exceptions.NotFound(msg)
elif num > 1: elif num > 1:
raise exceptions.NoUniqueMatch raise exceptions.NoUniqueMatch
else: else:

2
glanceclient/openstack/common/apiclient/exceptions.py
View File

@ -465,7 +465,7 @@ def from_response(response, method, url):
kwargs["details"] = (error.get("details") or kwargs["details"] = (error.get("details") or
six.text_type(body)) six.text_type(body))
elif content_type.startswith("text/"): elif content_type.startswith("text/"):
kwargs["details"] = response.text kwargs["details"] = getattr(response, 'text', '')
try: try:
cls = _code_map[response.status_code] cls = _code_map[response.status_code]

1
openstack-common.conf
View File

@ -2,7 +2,6 @@
# The list of modules to copy from openstack-common # The list of modules to copy from openstack-common
module=apiclient module=apiclient
module=gettextutils
# The base module to hold the copy of openstack.common # The base module to hold the copy of openstack.common
base=glanceclient base=glanceclient