From 723aea37263571865edc9e0299fedbe266a47223 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Tue, 26 Feb 2019 09:44:01 +0100 Subject: Implement Embedding To Make Signatures Always Available Situation.. PySide works fine with normal applications. But when installers are used to pack the application together, then the signature extension cannot be loaded. This is a problem that exists since the signature extension was written. But starting with PySide 5.12.1, the signature extension is very visible, because it is used to support the __doc__ attribute. There have beed successful attempts to solve the problem for PyInstaller and Py2App. But there are more packers available, and they all need a change both in PySide and in the packer. Solution.. To solve this problem once and for all, we embed the Python support files in the binary shiboken package. When the Python files are not normally accessible, they are unpacked from a ZIP file. Details.. - The embedded files shall only be used when the normal files are not available, - The signature extension should no longer be lazily loaded. When the application starts, all files should be present. - We drop support for shiboken2.support.signature and use a single, independen folder 'shibokensupport' (proposal). This avoids problems with multiple existence of the shiboken2 folder. PySide2.support.signature remains the official interface, but it's only an alias when PySide2 exists. - The embedding is used when the normal files cannot be loaded for some reason. It can be enforced by a sys variable "pyside_uses_embedding". - Testcase is included. - Tested with PyInstaller on macOS Fixes: PYSIDE-932 Fixes: PYSIDE-942 Change-Id: Iaa62dc0623503a2e0943eedd10d2b2484c65cc2d Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint --- .../shibokenmodule/files.dir/shibokensupport/signature/mapping.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py') diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py index 470dd676b..9a8ee4c4e 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -52,7 +52,6 @@ in sys.modules. This minimizes the loading overhead. import sys import struct import os -import pkgutil from shibokensupport.signature import typing from shibokensupport.signature.typing import TypeVar, Generic @@ -168,9 +167,7 @@ class _NotCalled(str): real object is needed, the wrapper can simply be called. """ def __repr__(self): - suppress = "support.signature.typing27." - text = self[len(suppress):] if self.startswith(suppress) else self - return "{}({})".format(type(self).__name__, text) + return "{}({})".format(type(self).__name__, self) def __call__(self): from shibokensupport.signature.mapping import __dict__ as namespace @@ -346,6 +343,7 @@ def init_other(): def init_smart(): type_map.update({ "smart.SharedPtr": Missing("smart.SharedPtr"), # bad object "SharedPtr" + "smart.Smart.Integer2": int, }) return locals() -- cgit v1.2.3