Merge tag 'v5.15.8-lts' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl

Qt For Python Release 5.15.8

Change-Id: Ib92716482ef78eead1859f4f0c980b308a6e5846

1 files changed, 9 insertions, 1 deletions

diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index 92511df32..fa6c6c2f1 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -57,6 +57,12 @@ from shibokensupport.signature import typing
 from shibokensupport.signature.typing import TypeVar, Generic
 from shibokensupport.signature.lib.tool import with_metaclass
 
+if sys.version_info[0] == 3:
+    # Avoid a deprecation warning
+    from _imp import is_builtin
+else:
+    from imp import is_builtin
+
 class ellipsis(object):
     def __repr__(self):
         return "..."
@@ -181,7 +187,8 @@ class Reloader(object):
         if getattr(mod, "__file__", None) and not os.path.isdir(mod.__file__):
             ending = os.path.splitext(mod.__file__)[-1]
             return ending not in (".py", ".pyc", ".pyo", ".pyi")
-        return False
+        # Python 2 leaves lots of empty crap in sys.modules
+        return bool(hasattr(mod, "__name__") and is_builtin(mod.__name__))
 
     def update(self):
         """
@@ -300,6 +307,7 @@ type_map.update({
     "zero(object)": None,
     "zero(str)": "",
     "zero(typing.Any)": None,
+    "zero(Any)": None,
     })
 
 type_map.update({