diff options
| author | Christian Tismer <tismer@stackless.com> | 2021-01-21 19:06:38 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2021-02-06 18:20:16 +0100 |
| commit | 1e501c49bfa0832fd4a36903bc88a20f88565cf7 (patch) | |
| tree | 243a6acb644385371c5fe4c38f3ea84139811e40 /sources/pyside6/PySide6 | |
| parent | 408ccdeccf82d114656a3f85d5fe80a5e3dd3c69 (diff) | |
move "shiboken6/shiboken6" to "shiboken6/Shiboken"
Modifying the paths to work in the new way is a quite ambitious
task. But doing so improves the overall project structure and
makes imports unambiguous.
This patch should not be applied alone but with
move "shiboken6/shiboken6" to "shiboken6/Shiboken" temp
The reworked version of this patch no longer has different
structures in `build` and `install`.
Tested with
Python 3.6, 3.7, 3.8, 3.9 debug build
Python 3.6 debug install
Python 3.9 release install
Task-number: PYSIDE-1497
Change-Id: Id9d816dd825907f9359651e7e2f69f54e1ba46c9
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6/PySide6')
| -rw-r--r-- | sources/pyside6/PySide6/__init__.py.in | 13 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/support/__init__.py | 2 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/support/generate_pyi.py | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sources/pyside6/PySide6/__init__.py.in b/sources/pyside6/PySide6/__init__.py.in index 9b86c1830..a0b9699f2 100644 --- a/sources/pyside6/PySide6/__init__.py.in +++ b/sources/pyside6/PySide6/__init__.py.in @@ -54,10 +54,12 @@ def _setupQtDirectories(): os.add_dll_directory(dir) try: - import shiboken6 + # PYSIDE-1497: we use the build dir or install dir or site-packages, whatever the path + # setting dictates. There is no longer a difference in path structure. + from shiboken6 import Shiboken except Exception: paths = ', '.join(sys.path) - print(f"PySide6/__init__.py: Unable to import shiboken6 from {paths}", + print(f"PySide6/__init__.py: Unable to import Shiboken from {paths}", file=sys.stderr) raise @@ -66,16 +68,17 @@ def _setupQtDirectories(): # PYSIDE-829: Avoid non-existent attributes in compiled code (Nuitka). # We now use an explicit function instead of touching a signature. _init_pyside_extension() - except AttributeError: + except (AttributeError, NameError): stars = 79 * "*" + fname = Shiboken.__file__ print(dedent(f'''\ {stars} PySide6/__init__.py: The `signature` module was not initialized. This libshiboken module was loaded from - "{shiboken6.__file__}". + "{fname}". - Please make sure that this is the real shiboken6 binary and not just a folder. + Please make sure that this is the real Shiboken binary and not just a folder. {stars} '''), file=sys.stderr) raise diff --git a/sources/pyside6/PySide6/support/__init__.py b/sources/pyside6/PySide6/support/__init__.py index 996acb05a..7d8c808aa 100644 --- a/sources/pyside6/PySide6/support/__init__.py +++ b/sources/pyside6/PySide6/support/__init__.py @@ -37,6 +37,6 @@ ## ############################################################################# -from shiboken6 import VoidPtr +from shiboken6.Shiboken import VoidPtr #eof diff --git a/sources/pyside6/PySide6/support/generate_pyi.py b/sources/pyside6/PySide6/support/generate_pyi.py index 32f43d804..8abab35f0 100644 --- a/sources/pyside6/PySide6/support/generate_pyi.py +++ b/sources/pyside6/PySide6/support/generate_pyi.py @@ -145,7 +145,7 @@ class Formatter(Writer): self.print() self.print("class Object(object): pass") self.print() - self.print("import shiboken6 as Shiboken") + self.print("from shiboken6 import Shiboken") self.print("Shiboken.Object = Object") self.print() # This line will be replaced by the missing imports postprocess. |