From 6869a49bc389166b307b56efa3a2677325c86247 Mon Sep 17 00:00:00 2001
From: Renato Filho <renato.filho@openbossa.org>
Date: Thu, 6 Oct 2011 11:43:05 -0300
Subject: Updated pyside and signals tests to works with python 2.x and 3.x

---
 tests/pysidetest/modelview_test.py  |  3 ++-
 tests/signals/decorators_test.py    | 18 ++++++++----------
 tests/signals/signal_object_test.py | 20 +++++++++-----------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/tests/pysidetest/modelview_test.py b/tests/pysidetest/modelview_test.py
index 07374562b..f1cd8bbb1 100644
--- a/tests/pysidetest/modelview_test.py
+++ b/tests/pysidetest/modelview_test.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import unittest
+import py3kcompat as py3k
 from testbinding import TestView
 from PySide.QtCore import QAbstractListModel, QObject, QModelIndex
 
@@ -62,7 +63,7 @@ class ModelViewTest(unittest.TestCase):
         model = ListModelThatReturnsString()
         view = TestView(model)
         obj = view.getData()
-        self.assertEqual(type(obj), unicode)
+        self.assertEqual(type(obj), py3k.unicode)
         self.assertEqual(obj, 'string')
 
 if __name__ == '__main__':
diff --git a/tests/signals/decorators_test.py b/tests/signals/decorators_test.py
index da9c1cae4..8ca614ecb 100644
--- a/tests/signals/decorators_test.py
+++ b/tests/signals/decorators_test.py
@@ -1,10 +1,8 @@
 #!/usr/bin/env python
 
-import sys
 import unittest
-import functools
 
-from PySide.QtCore import *
+from PySide.QtCore import QObject, Slot, SIGNAL, SLOT
 
 class MyObject(QObject):
     def __init__(self, parent=None):
@@ -24,7 +22,7 @@ class MyObject(QObject):
     def foo(self):
         self._slotCalledCount = self._slotCalledCount + 1
 
-    @Slot(unicode, int)
+    @Slot(str, int)
     def mySlot4(self, a, b):
         self._slotCalledCount = self._slotCalledCount + 1
 
@@ -41,17 +39,17 @@ class StaticMetaObjectTest(unittest.TestCase):
     def testSignalPropagation(self):
         o = MyObject()
         m = o.metaObject()
-        self.assert_(m.indexOfSlot('mySlot()') > 0)
-        self.assert_(m.indexOfSlot('mySlot2(int)') > 0)
-        self.assert_(m.indexOfSlot('mySlot2(QString)') > 0)
-        self.assert_(m.indexOfSlot('mySlot3()') > 0)
-        self.assert_(m.indexOfSlot('mySlot4(QString,int)') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot()') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot2(int)') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot2(QString)') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot3()') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot4(QString,int)') > 0)
 
     def testEmission(self):
         o = MyObject()
         o.connect(SIGNAL("mySignal()"), o, SLOT("mySlot()"))
         o.emit(SIGNAL("mySignal()"))
-        self.assert_(o._slotCalledCount == 1)
+        self.assertTrue(o._slotCalledCount == 1)
 
     def testResult(self):
         o = MyObject()
diff --git a/tests/signals/signal_object_test.py b/tests/signals/signal_object_test.py
index 1b1f2222a..5c4e06075 100644
--- a/tests/signals/signal_object_test.py
+++ b/tests/signals/signal_object_test.py
@@ -1,18 +1,16 @@
 #!/usr/bin/env python
 
-import sys
 import unittest
-import functools
 
-from PySide.QtCore import *
+from PySide.QtCore import QTimer, Signal, QObject, Slot, Qt
 from helper import UsesQCoreApplication
 
 class MyObject(QTimer):
     sig1 = Signal()
     sig2 = Signal(int, name='rangeChanged')
     sig3 = Signal(int)
-    sig4 = Signal((int,), (unicode,))
-    sig5 = Signal((unicode,), (int,))
+    sig4 = Signal((int,), (str,))
+    sig5 = Signal((str,), (int,))
     sig6 = Signal(QObject)
 
     @Slot(int)
@@ -38,7 +36,7 @@ class SignalObjectTest(UsesQCoreApplication):
         o = MyObject()
         o.sig1.connect(o.slot1)
         o.sig1.emit()
-        self.assert_(o._called)
+        self.assertTrue(o._called)
 
     def testSignalWithArgs(self):
         o = MyObject()
@@ -53,8 +51,8 @@ class SignalObjectTest(UsesQCoreApplication):
 
     def testDictOperator(self):
         o = MyObject()
-        o.sig4[unicode].connect(o.slotString)
-        o.sig4[unicode].emit("PySide")
+        o.sig4[str].connect(o.slotString)
+        o.sig4[str].emit("PySide")
         self.assertEqual(o._s, "PySide")
 
     def testGeneretedSignal(self):
@@ -62,19 +60,19 @@ class SignalObjectTest(UsesQCoreApplication):
         o.timeout.connect(self.cb)
         o.start(100)
         self.app.exec_()
-        self.assert_(self._cb_called)
+        self.assertTrue(self._cb_called)
 
     def testConnectionType(self):
         o = MyObject()
         o.timeout.connect(self.cb, type=Qt.DirectConnection)
         o.start(100)
         self.app.exec_()
-        self.assert_(self._cb_called)
+        self.assertTrue(self._cb_called)
 
     def testSignalWithSignal(self):
         o = MyObject()
         o.sig2.connect(o.myRange)
-        print "sig->sig", o.sig5.connect(o.sig2)
+        o.sig5.connect(o.sig2)
         o.sig5[int].emit(10)
         self.assertEqual(o._range, 10)
 
-- 
cgit v1.2.3