actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)

1 files changed, 52 insertions, 0 deletions

diff --git a/src/leap/testing/pyqt.py b/src/leap/testing/pyqt.py
new file mode 100644
index 00000000..6edaf059
--- /dev/null
+++ b/src/leap/testing/pyqt.py
@@ -0,0 +1,52 @@
+from PyQt4 import QtCore
+
+_oldConnect = QtCore.QObject.connect
+_oldDisconnect = QtCore.QObject.disconnect
+_oldEmit = QtCore.QObject.emit
+
+
+def _wrapConnect(callableObject):
+    """
+    Returns a wrapped call to the old version of QtCore.QObject.connect
+    """
+    @staticmethod
+    def call(*args):
+        callableObject(*args)
+        _oldConnect(*args)
+    return call
+
+
+def _wrapDisconnect(callableObject):
+    """
+    Returns a wrapped call to the old version of QtCore.QObject.disconnect
+    """
+    @staticmethod
+    def call(*args):
+        callableObject(*args)
+        _oldDisconnect(*args)
+    return call
+
+
+def enableSignalDebugging(**kwargs):
+    """
+    Call this to enable Qt Signal debugging. This will trap all
+    connect, and disconnect calls.
+    """
+
+    f = lambda *args: None
+    connectCall = kwargs.get('connectCall', f)
+    disconnectCall = kwargs.get('disconnectCall', f)
+    emitCall = kwargs.get('emitCall', f)
+
+    def printIt(msg):
+        def call(*args):
+            print msg, args
+        return call
+    QtCore.QObject.connect = _wrapConnect(connectCall)
+    QtCore.QObject.disconnect = _wrapDisconnect(disconnectCall)
+
+    def new_emit(self, *args):
+        emitCall(self, *args)
+        _oldEmit(self, *args)
+
+    QtCore.QObject.emit = new_emit