Use oslo.utils.reflection to extract class name
The oslo.utils.reflection.get_class_name() handles more variations of where a class name may come from (on) python 2 and python 3. Its usage allows getting more accurate class names so we'd better use it. Change-Id: I97cc7f1e818161c2fe265da1ed1b52add1951c90
This commit is contained in:
parent
7ee16eed9f
commit
236ba5fa65
@ -13,6 +13,7 @@
|
||||
import sys
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import reflection
|
||||
|
||||
from heatclient.openstack.common._i18n import _
|
||||
|
||||
@ -78,9 +79,9 @@ class HTTPMultipleChoices(HTTPException):
|
||||
"available.")
|
||||
return (_("%(name)s (HTTP %(code)s) %(details)s") %
|
||||
{
|
||||
'name': self.__class__.__name__,
|
||||
'code': self.code,
|
||||
'details': self.details})
|
||||
'name': reflection.get_class_name(self, fully_qualified=False),
|
||||
'code': self.code,
|
||||
'details': self.details})
|
||||
|
||||
|
||||
class BadRequest(HTTPException):
|
||||
|
@ -41,6 +41,7 @@ import abc
|
||||
import copy
|
||||
import logging
|
||||
|
||||
from oslo_utils import reflection
|
||||
from oslo_utils import strutils
|
||||
import six
|
||||
from six.moves.urllib import parse
|
||||
@ -466,7 +467,8 @@ class Resource(object):
|
||||
for k in self.__dict__.keys()
|
||||
if k[0] != '_' and k != 'manager')
|
||||
info = ", ".join("%s=%s" % (k, getattr(self, k)) for k in reprkeys)
|
||||
return "<%s %s>" % (self.__class__.__name__, info)
|
||||
class_name = reflection.get_class_name(self, fully_qualified=False)
|
||||
return "<%s %s>" % (class_name, info)
|
||||
|
||||
@property
|
||||
def human_id(self):
|
||||
|
@ -16,6 +16,7 @@
|
||||
import json
|
||||
import sys
|
||||
|
||||
from oslo_utils import reflection
|
||||
import requests
|
||||
import six
|
||||
|
||||
@ -222,7 +223,8 @@ class FakeResource(object):
|
||||
reprkeys = sorted(k for k in self.__dict__.keys() if k[0] != '_' and
|
||||
k != 'manager')
|
||||
info = ", ".join("%s=%s" % (k, getattr(self, k)) for k in reprkeys)
|
||||
return "<%s %s>" % (self.__class__.__name__, info)
|
||||
class_name = reflection.get_class_name(self, fully_qualified=False)
|
||||
return "<%s %s>" % (class_name, info)
|
||||
|
||||
|
||||
class FakeResponse(requests.Response):
|
||||
|
Loading…
Reference in New Issue
Block a user