diff options
Diffstat (limited to 'sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py')
| -rw-r--r-- | sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py index 49c6439b7..766ff2437 100644 --- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py +++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py @@ -50,7 +50,7 @@ to make sure that the functions are available when needed. This is meanwhile necessary to make the '__doc__' attribute work correctly. It does not mean that everything is initialized in advance. Only the modules -are loaded completely after 'import PySide2'. +are loaded completely after 'import PySide6'. This version uses both a normal directory, but has also an embedded ZIP file as a fallback solution. The ZIP file is generated by 'embedding_generator.py' @@ -173,23 +173,23 @@ put_into_package(shibokensupport.signature, inspect, "inspect") def move_into_pyside_package(): - import PySide2 + import PySide6 try: - import PySide2.support + import PySide6.support except ModuleNotFoundError: - PySide2.support = types.ModuleType("PySide2.support") - put_into_package(PySide2.support, __feature__) - put_into_package(PySide2.support, signature) - put_into_package(PySide2.support.signature, mapping) - put_into_package(PySide2.support.signature, errorhandler) - put_into_package(PySide2.support.signature, layout) - put_into_package(PySide2.support.signature, lib) - put_into_package(PySide2.support.signature, parser) - put_into_package(PySide2.support.signature, importhandler) - put_into_package(PySide2.support.signature.lib, enum_sig) - - put_into_package(None if orig_typing else PySide2.support.signature, typing) - put_into_package(PySide2.support.signature, inspect) + PySide6.support = types.ModuleType("PySide6.support") + put_into_package(PySide6.support, __feature__) + put_into_package(PySide6.support, signature) + put_into_package(PySide6.support.signature, mapping) + put_into_package(PySide6.support.signature, errorhandler) + put_into_package(PySide6.support.signature, layout) + put_into_package(PySide6.support.signature, lib) + put_into_package(PySide6.support.signature, parser) + put_into_package(PySide6.support.signature, importhandler) + put_into_package(PySide6.support.signature.lib, enum_sig) + + put_into_package(None if orig_typing else PySide6.support.signature, typing) + put_into_package(PySide6.support.signature, inspect) from shibokensupport.signature import mapping from shibokensupport.signature import errorhandler @@ -199,16 +199,16 @@ from shibokensupport.signature import parser from shibokensupport.signature import importhandler from shibokensupport.signature.lib import enum_sig -if "PySide2" in sys.modules: - # We publish everything under "PySide2.support.signature", again. +if "PySide6" in sys.modules: + # We publish everything under "PySide6.support.signature", again. move_into_pyside_package() # PYSIDE-1019: Modify `__import__` to be `__feature__` aware. # __feature__ is already in sys.modules, so this is actually no import try: - import PySide2.support.__feature__ - sys.modules["__feature__"] = PySide2.support.__feature__ - PySide2.support.__feature__.original_import = __builtins__["__import__"] - __builtins__["__import__"] = PySide2.support.__feature__._import + import PySide6.support.__feature__ + sys.modules["__feature__"] = PySide6.support.__feature__ + PySide6.support.__feature__.original_import = __builtins__["__import__"] + __builtins__["__import__"] = PySide6.support.__feature__._import # Maybe we should optimize that and change `__import__` from C, instead? except ModuleNotFoundError: print("__feature__ could not be imported. " |