1 files changed, 33 insertions, 9 deletions
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
index 34977f3bd..fb4c9eeca 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
@@ -1,6 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
+# flake8: noqa E:402
+# flake8: noqa F:401
+
 """
 loader.py
 
@@ -30,22 +33,27 @@ import types
 def pyside_type_init(type_key, sig_strings):
     return parser.pyside_type_init(type_key, sig_strings)
 
+
 # name used in signature.cpp
 def create_signature(props, key):
     return layout.create_signature(props, key)
 
+
 # name used in signature.cpp
 def seterror_argument(args, func_name, info):
     return errorhandler.seterror_argument(args, func_name, info)
 
+
 # name used in signature.cpp
 def make_helptext(func):
     return errorhandler.make_helptext(func)
 
+
 # name used in signature.cpp
 def finish_import(module):
     return importhandler.finish_import(module)
 
+
 # name used in signature.cpp
 def feature_import(*args, **kwds):
     # don't spend a stack level here for speed and compatibility
@@ -54,6 +62,14 @@ def feature_import(*args, **kwds):
     return feature_import(*args, **kwds)
 
 
+# name used in signature.cpp
+def feature_imported(*args, **kwds):
+    # don't spend a stack level here for speed and compatibility
+    global feature_imported
+    feature_imported = feature.feature_imported
+    return feature_imported(*args, **kwds)
+
+
 import builtins
 import signature_bootstrap
 from shibokensupport import signature, feature
@@ -100,6 +116,7 @@ def move_into_pyside_package():
     put_into_package(PySide6.support.signature.lib, pyi_generator)
     put_into_package(PySide6.support.signature.lib, tool)
 
+
 from shibokensupport.signature import mapping
 from shibokensupport.signature import errorhandler
 from shibokensupport.signature import layout
@@ -112,23 +129,30 @@ from shibokensupport.signature.lib import tool
 
 import enum
 
+post_init = lambda: None  # noqa E:731 default
+
 if "PySide6" in sys.modules:
     # We publish everything under "PySide6.support", again.
     move_into_pyside_package()
     # PYSIDE-1502: Make sure that support can be imported.
     try:
         import PySide6.support
-    except ModuleNotFoundError as e:
+    except ModuleNotFoundError:
         print("PySide6.support could not be imported. "
               "This is a serious configuration error.", file=sys.stderr)
         raise
-    # PYSIDE-1019: Modify `__import__` to be `__feature__` aware.
-    # __feature__ is already in sys.modules as feature, so this is actually no import
-    if not is_pypy:
-        # PYSIDE-535: Cannot enable __feature__ for various reasons.
-        import PySide6.support.feature
-        sys.modules["__feature__"] = PySide6.support.feature
-        builtins.__orig_import__ = builtins.__import__
-        builtins.__import__ = builtins.__feature_import__
+
+    def post_init():
+        """
+        This function needs to be called explicitly when all function pointers are set.
+        Doing this during import has bad side-effects when preloading the loader.
+        """
+        # PYSIDE-1019: Modify `__import__` to be `__feature__` aware.
+        if not is_pypy:
+            # PYSIDE-535: Cannot enable __feature__ for various reasons.
+            import PySide6.support.feature
+            sys.modules["__feature__"] = PySide6.support.feature
+            builtins.__orig_import__ = builtins.__import__
+            builtins.__import__ = builtins.__feature_import__
 
 # end of file