Merge pull request #136 from abstractfactory/fix135

Fix #135

Author: mottosso

Qt.py

@@ -31,7 +31,7 @@
 import os
 import sys
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 # All unique members of Qt.py
 __added__ = list()
@@ -68,14 +68,20 @@ def remap(object, name, value, safe=True):
             raise AttributeError("%s != 'module': Cannot alter "
                                  "anything but modules" % object)
 
-    __remapped__.append(name)
+    elif hasattr(object, name):
+        # Keep track of modifications
+        __modified__.append(name)
+
+    if name not in __added__:
+        __remapped__.append(name)
+
     setattr(object, name, value)
 
 
-def add(object, name, value):
+def add(object, name, value, safe=True):
     """Identical to :func:`remap` and provided for readability only"""
     __added__.append(name)
-    remap(object, name, value)
+    remap(object, name, value, safe)
 
 
 def pyqt5():
@@ -89,7 +95,7 @@ def pyqt5():
     add(PyQt5, "__wrapper_version__", __version__)
     add(PyQt5, "__binding__", "PyQt5")
     add(PyQt5, "__binding_version__", QtCore.PYQT_VERSION_STR)
-    add(PyQt5, "__qt_version__", QtCore.QT_VERSION_STR)
+    add(PyQt5, "__qt_version__", QtCore.QT_VERSION_STR, safe=False)
     add(PyQt5, "__added__", __added__)
     add(PyQt5, "__remapped__", __remapped__)
     add(PyQt5, "__modified__", __modified__)
@@ -244,20 +250,24 @@ def init():
         try:
             binding = binding()
 
+        except ImportError as e:
+            log(" - ImportError(\"%s\")\n" % e, verbose)
+            continue
+
+        else:
+            # Reference to this module
+            binding.__shim__ = sys.modules[__name__]
+
             sys.modules.update({
                 __name__: binding,
 
                 # Fix #133, `from Qt.QtWidgets import QPushButton`
                 __name__ + ".QtWidgets": binding.QtWidgets
+
             })
 
             return
 
-        except ImportError as e:
-            log(" - ImportError(\"%s\")\n" % e, verbose)
-
-            continue
-
     # If not binding were found, throw this error
     raise ImportError("No Qt binding were found.")
 

README.md

@@ -88,6 +88,7 @@ All members of `Qt` stem directly from those available via PySide2, along with t
 | `__added__`             | `list(str)` | All unique members of Qt.py
 | `__remapped__`          | `list(str)` | Members copied from elsewhere, such as QtGui -> QtWidgets
 | `__modified__`          | `list(str)` | Existing members modified in some way
+| `__shim__`              | `str`       | Reference to original Qt.py Python module
 | `load_ui(fname=str)`    | `QObject`   | Minimal wrapper of PyQt4.loadUi and PySide equivalent
 
 <br>

tests.py

@@ -159,6 +159,61 @@ def test_vendoring():
     ) == 0
 
 
+def test_meta_add():
+    """Qt.add() appends to __added__"""
+    import types
+    import Qt
+
+    module = imp.new_module("QtMock")
+
+    Qt.__shim__.add(module, "MyAttr", None)
+
+    assert "MyAttr" in Qt.__added__, Qt.__added__
+    assert "MyAttr" not in Qt.__remapped__
+    assert "MyAttr" not in Qt.__modified__
+
+def test_meta_remap():
+    """Qt.remap() appends to __modified__"""
+    import types
+    import Qt
+
+    module = imp.new_module("QtMock")
+
+    Qt.__shim__.remap(module, "MyAttr", None)
+
+    assert "MyAttr" not in Qt.__added__, Qt.__added__
+    assert "MyAttr" in Qt.__remapped__
+    assert "MyAttr" not in Qt.__modified__
+
+
+
+def test_meta_add_existing():
+    """Qt.add() appends to __added__"""
+    import types
+    import Qt
+
+    module = imp.new_module("QtMock")
+    module.MyAttr = None
+
+    assert_raises(AttributeError, Qt.__shim__.add, module, "MyAttr", None)
+
+
+def test_meta_force_add_existing():
+    """Unsafe Qt.add() of existing member adds to modified"""
+    import types
+    import Qt
+
+    module = imp.new_module("QtMock")
+    module.MyAttr = 123
+
+    Qt.__shim__.add(module, "MyAttr", None, safe=False)
+
+    assert "MyAttr" in Qt.__added__, Qt.__added__
+    assert "MyAttr" not in Qt.__remapped__
+    assert "MyAttr" in Qt.__modified__
+    assert module.MyAttr is None, module.MyAttr
+
+
 def test_import_from_qtwidgets():
     """Fix #133, `from Qt.QtWidgets import XXX` works"""
     from Qt.QtWidgets import QPushButton