Merge "Update get_class_name from olso.utils"

This commit is contained in:
Jenkins 2015-12-02 20:25:22 +00:00 committed by Gerrit Code Review
commit 34f4777298
1 changed files with 6 additions and 15 deletions

View File

@ -103,21 +103,12 @@ def get_class_name(obj, fully_qualified=True):
pass
else:
if built_in:
try:
return obj.__qualname__
except AttributeError:
return obj.__name__
pieces = []
try:
pieces.append(obj.__qualname__)
except AttributeError:
pieces.append(obj.__name__)
if fully_qualified:
try:
pieces.insert(0, obj.__module__)
except AttributeError:
pass
return '.'.join(pieces)
return obj.__name__
if fully_qualified and hasattr(obj, '__module__'):
return '%s.%s' % (obj.__module__, obj.__name__)
else:
return obj.__name__
def get_method_self(method):