From e2fc750b5b5e2fbb5840b99713e3f2ecddae45af Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 11 Jan 2018 09:40:15 -0800 Subject: [PATCH 1/2] Add from Qt.QtCompat import support --- Qt.py | 3 +++ tests.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/Qt.py b/Qt.py index 0c09f670..b5930dac 100644 --- a/Qt.py +++ b/Qt.py @@ -1546,6 +1546,9 @@ def _install(): setattr(our_submodule, member, their_member) + # Enable direct import of QtCompat + sys.modules['Qt.QtCompat'] = Qt.QtCompat + # Backwards compatibility if hasattr(Qt.QtCompat, 'loadUi'): Qt.QtCompat.load_ui = Qt.QtCompat.loadUi diff --git a/tests.py b/tests.py index 57a52994..10bf12ea 100644 --- a/tests.py +++ b/tests.py @@ -606,6 +606,12 @@ def test_import_from_qtwidgets(): assert QPushButton.__name__ == "QPushButton", QPushButton +def test_import_from_qtcompat(): + """ `from Qt.QtCompat import XXX` works """ + from Qt.QtCompat import loadUi + assert loadUi.__name__ == "_loadUi", loadUi + + def test_i158_qtcore_direct_import(): """import Qt.QtCore works on all bindings From fa3997c38cfd8f01936543e8e248def6933edf78 Mon Sep 17 00:00:00 2001 From: Marcus Ottosson Date: Mon, 15 Jan 2018 11:45:50 +0000 Subject: [PATCH 2/2] Version bump --- Qt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Qt.py b/Qt.py index b5930dac..9c827ee2 100644 --- a/Qt.py +++ b/Qt.py @@ -43,7 +43,7 @@ import shutil -__version__ = "1.1.0.b9" +__version__ = "1.1.0.b10" # Enable support for `from Qt import *` __all__ = []