Merge pull request #134 from abstractfactory/fix133

Fix #133

Author: mottosso

Qt.py

@@ -31,7 +31,7 @@
 import os
 import sys
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 # All unique members of Qt.py
 __added__ = list()
@@ -239,10 +239,18 @@ def init():
             )
 
     for binding in bindings:
-        log("Trying %s" % binding.__name__[1:], verbose)
+        log("Trying %s" % binding.__name__, verbose)
 
         try:
-            sys.modules[__name__] = binding()
+            binding = binding()
+
+            sys.modules.update({
+                __name__: binding,
+
+                # Fix #133, `from Qt.QtWidgets import QPushButton`
+                __name__ + ".QtWidgets": binding.QtWidgets
+            })
+
             return
 
         except ImportError as e:

run_tests.py

@@ -32,20 +32,23 @@ def binding(binding):
         "--exe",
     ]
 
-    # argv.extend(sys.argv[1:])
+    errors = 0
 
     # Running each test independently via subprocess
     # enables tests to filter out from tests.py before
     # being split into individual processes via the
     # --with-process-isolation feature of nose.
     with binding("PyQt4"):
-        subprocess.call(argv)
+        errors += subprocess.call(argv)
 
     with binding("PySide"):
-        subprocess.call(argv)
+        errors += subprocess.call(argv)
 
     with binding("PyQt5"):
-        subprocess.call(argv)
+        errors += subprocess.call(argv)
 
     with binding("PySide2"):
-        subprocess.call(argv)
+        errors += subprocess.call(argv)
+
+    if errors:
+        raise Exception("%i binding(s) failed." % errors)

tests.py

@@ -159,6 +159,12 @@ def test_vendoring():
     ) == 0
 
 
+def test_import_from_qtwidgets():
+    """Fix #133, `from Qt.QtWidgets import XXX` works"""
+    from Qt.QtWidgets import QPushButton
+    assert QPushButton.__name__ == "QPushButton", QPushButton
+
+
 if binding("PyQt4"):
     def test_preferred_pyqt4():
         """QT_PREFERRED_BINDING = PyQt4 properly forces the binding"""