Updated QtGui modue to works with python 2.x and 3.x

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/QtGui/qfontmetrics_test.py b/tests/QtGui/qfontmetrics_test.py
index 96c022fc1..59f01f9e7 100644
--- a/tests/QtGui/qfontmetrics_test.py
+++ b/tests/QtGui/qfontmetrics_test.py
@@ -30,21 +30,21 @@ class BoundingRectTest(QFontMetricsTest):
         rect = self.metrics.boundingRect(0, 0, 0, 0,
                                          Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT')
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testIntWithArg(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - single arg'''
         rect = self.metrics.boundingRect(0, 0, 0, 0,
                                          Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 2)
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testIntWithFull(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - all argss'''
         rect = self.metrics.boundingRect(0, 0, 0, 0,
                                          Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 20, [1, 2, 3, 4, 5])
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testIntTypeError(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - type error'''
@@ -57,14 +57,14 @@ class BoundingRectTest(QFontMetricsTest):
         arg = QRect(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT')
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testQRectWithArg(self):
         '''QFontMetrics.boundingRect(QRect, ...) - only tabstops'''
         arg = QRect(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 2)
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testQRectWithFull(self):
         '''QFontMetrics.boundingRect(QRect, ...) - all arguments'''
@@ -72,7 +72,7 @@ class BoundingRectTest(QFontMetricsTest):
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 20,
                                          [1, 2, 3, 4, 5])
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testQRectTypeError(self):
         '''QFontMetrics.boundingRect(QRect, ...) - type error'''
@@ -89,19 +89,19 @@ class SizeTest(QFontMetricsTest):
         '''QFontMetrics.size - default arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT')
-        self.assert_(isinstance(size, QSize))
+        self.assertTrue(isinstance(size, QSize))
 
     def testWithTabStops(self):
         '''QFontMetrics.size - only tabstops'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2)
-        self.assert_(isinstance(size, QSize))
+        self.assertTrue(isinstance(size, QSize))
 
     def testFull(self):
         '''QFontMetrics.size - all arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2, [1, 2, 3, 4])
-        self.assert_(isinstance(size, QSize))
+        self.assertTrue(isinstance(size, QSize))
 
     def testTypeError(self):
         '''QFontMetrics.size - type error'''
@@ -132,14 +132,14 @@ class FBoundingRectTest(QFontMetricsFTest):
         arg = QRectF(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT')
-        self.assert_(isinstance(rect, QRectF))
+        self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectWithArg(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - only tabstops'''
         arg = QRectF(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 2)
-        self.assert_(isinstance(rect, QRectF))
+        self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectWithFull(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - all arguments'''
@@ -147,7 +147,7 @@ class FBoundingRectTest(QFontMetricsFTest):
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 20,
                                          [1, 2, 3, 4, 5])
-        self.assert_(isinstance(rect, QRectF))
+        self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectTypeError(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - type error'''
@@ -164,19 +164,19 @@ class FSizeTest(QFontMetricsFTest):
         '''QFontMetricsF.size - default arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT')
-        self.assert_(isinstance(size, QSizeF))
+        self.assertTrue(isinstance(size, QSizeF))
 
     def testWithTabStops(self):
         '''QFontMetricsF.size - only tabstops'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2)
-        self.assert_(isinstance(size, QSizeF))
+        self.assertTrue(isinstance(size, QSizeF))
 
     def testFull(self):
         '''QFontMetricsF.size - all arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2, [1, 2, 3, 4])
-        self.assert_(isinstance(size, QSizeF))
+        self.assertTrue(isinstance(size, QSizeF))
 
     def testTypeError(self):
         '''QFontMetricsF.size - type error'''
@@ -193,7 +193,7 @@ class QCharTest(QFontMetricsFTest):
 
     def testWith(self):
         retCh = self.metrics.widthChar('a')
-        self.assert_(retCh > 0)
+        self.assertTrue(retCh > 0)
 
 if __name__ == '__main__':
     unittest.main()