diff options
| author | Christian Tismer <tismer@stackless.com> | 2019-02-26 09:44:01 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2019-03-20 17:33:21 +0000 |
| commit | e8786b9cdccb63aa590af50fe5fa5496c6b216c7 (patch) | |
| tree | 89f30d78603c81937f0c6dd9f768576b6463f9f7 /sources/pyside2/tests | |
| parent | c32dacab85b435751db2811e7a88d5c03b1856e1 (diff) | |
Simplify Python Imports For Embedding
After the project split, shiboken exposed its own modules, and the
overall structure with shiboken2.support.signature and
PySide2.support.signature was already quite complicated.
When introducing embedding, it is necessary to have some support
folder that gets unpacked from a zipfile. That means, the shiboken2
root directory would be in the zip file in the embedding case.
This does not only increase the complexity, it further means
that we must make shiboken2.so available in the shiboken2
containing zipfile!
In order to avoid that, we stop the dependency from the two
support directories and use shibokensupport, instead. The
simplification of the loader and other modules is also significant.
Task-number: PYSIDE-510
Change-Id: Ic735a8d36f10f03698378f2ac9685a5955e40b0c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/tests')
| -rw-r--r-- | sources/pyside2/tests/QtWidgets/signature_test.py | 2 | ||||
| -rw-r--r-- | sources/pyside2/tests/registry/init_platform.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/tests/QtWidgets/signature_test.py b/sources/pyside2/tests/QtWidgets/signature_test.py index 15a9333b4..3a0114b07 100644 --- a/sources/pyside2/tests/QtWidgets/signature_test.py +++ b/sources/pyside2/tests/QtWidgets/signature_test.py @@ -42,7 +42,7 @@ from __future__ import print_function, absolute_import import unittest import PySide2.QtCore import PySide2.QtWidgets -from PySide2.support.signature import inspect +from shibokensupport.signature import inspect class PySideSignatureTest(unittest.TestCase): diff --git a/sources/pyside2/tests/registry/init_platform.py b/sources/pyside2/tests/registry/init_platform.py index a324c36a2..31e212287 100644 --- a/sources/pyside2/tests/registry/init_platform.py +++ b/sources/pyside2/tests/registry/init_platform.py @@ -139,7 +139,7 @@ for modname in "minimal sample other smart".split(): all_modules.append(modname) from PySide2.QtCore import __version__ -from PySide2.support.signature.lib.enum_sig import SimplifyingEnumerator +from shibokensupport.signature.lib.enum_sig import SimplifyingEnumerator is_py3 = sys.version_info[0] == 3 is_ci = os.environ.get("QTEST_ENVIRONMENT", "") == "ci" |