2 files changed, 8 insertions, 7 deletions
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py
index 6564786b9..1efc6fde5 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/loader.py
@@ -75,14 +75,18 @@ try:
 except NameError:
     ModuleNotFoundError = ImportError
 
+def _qualname(x):
+    return getattr(x, "__qualname__", x.__name__)
+
 # patching inspect's formatting to keep the word "typing":
 def formatannotation(annotation, base_module=None):
     # if getattr(annotation, '__module__', None) == 'typing':
     #     return repr(annotation).replace('typing.', '')
     if isinstance(annotation, type):
+        name = _qualname(annotation)
         if annotation.__module__ in ('builtins', base_module):
-            return annotation.__qualname__
-        return annotation.__module__ + '.' + annotation.__qualname__
+            return name
+        return annotation.__module__ + '.' + name
     return repr(annotation)
 
 # Note also that during the tests we have a different encoding that would
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py
index 44d78c433..41ed456cc 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/typing27.py
@@ -184,11 +184,8 @@ __all__ = [
 
 
 def _qualname(x):
-    if sys.version_info[:2] >= (3, 3):
-        return x.__qualname__
-    else:
-        # Fall back to just name.
-        return x.__name__
+    # PYSIDE-1286: Support __qualname__ in Python 2
+    return getattr(x, "__qualname__", x.__name__)
 
 
 def _trim_name(nm):