From 4a176c83e338c6b7f8113b8c2b0fed1a5554efdd Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Thu, 19 Nov 2015 20:27:15 +0800 Subject: [PATCH] Update get_class_name from olso.utils We recently Fixed get_class_name() in Python 3 in 7ef6a8fbf98a5da61c40989cc63c0c2261dca98e, sync this to debtcollector. Change-Id: I9d4031faa72bc2d464cb130bf82873d47c259a43 --- debtcollector/_utils.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/debtcollector/_utils.py b/debtcollector/_utils.py index 2a65553..e4af11f 100644 --- a/debtcollector/_utils.py +++ b/debtcollector/_utils.py @@ -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):