diff options
| author | Christian Tismer <tismer@stackless.com> | 2021-05-01 14:47:05 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2021-05-03 16:31:52 +0200 |
| commit | e9b8c4a5cf8c35905ba4c761e931cc4a86dab58f (patch) | |
| tree | de83030cbb8b041b01e3c94098e9f84d914096ea /sources/pyside6 | |
| parent | 7f346c39f345e7b741ab6d5ce70cb91fd0ff80ad (diff) | |
__feature__: Ensure that features are not affected by other imports6.0
Imports should not touch the feature dict unless they are feature imports.
This was a small error in the import logic.
Change-Id: I16045fffb4b770861ff2efba674667894e0798e5
Fixes: PYSIDE-1548
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 39ba36db0fb8a3c722cb23e02f38abab9c67592c)
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/PySide6/support/generate_pyi.py | 3 | ||||
| -rw-r--r-- | sources/pyside6/tests/QtCore/snake_prop_feature_test.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/support/generate_pyi.py b/sources/pyside6/PySide6/support/generate_pyi.py index 32f43d804..b55bf4ecd 100644 --- a/sources/pyside6/PySide6/support/generate_pyi.py +++ b/sources/pyside6/PySide6/support/generate_pyi.py @@ -277,7 +277,8 @@ def generate_all_pyi(outpath, options): # now we can import global PySide6, inspect, typing, HintingEnumerator, build_brace_pattern import PySide6 - from PySide6.support.signature import inspect, typing + import inspect + import typing from PySide6.support.signature.lib.enum_sig import HintingEnumerator from PySide6.support.signature.lib.tool import build_brace_pattern diff --git a/sources/pyside6/tests/QtCore/snake_prop_feature_test.py b/sources/pyside6/tests/QtCore/snake_prop_feature_test.py index 5f9328329..fe7de8ab3 100644 --- a/sources/pyside6/tests/QtCore/snake_prop_feature_test.py +++ b/sources/pyside6/tests/QtCore/snake_prop_feature_test.py @@ -89,6 +89,8 @@ class FeatureTest(unittest.TestCase): window.modal from __feature__ import snake_case, true_property + #PYSIDE-1548: Make sure that another import does not clear the features. + import sys self.assertTrue(isinstance(QtWidgets.QWidget.modal, property)) self.assertTrue(isinstance(window.modal, bool)) |