Skip to content

Commit

Permalink
Merge pull request #265 from blurstudio/importQtCompat
Browse files Browse the repository at this point in the history
Add from Qt.QtCompat import support
  • Loading branch information
mottosso authored Jan 15, 2018
2 parents 49cd9fe + fa3997c commit 71991d3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import shutil


__version__ = "1.1.0.b9"
__version__ = "1.1.0.b10"

# Enable support for `from Qt import *`
__all__ = []
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 71991d3

Please sign in to comment.