From 676b2b579d1f9ebd4300a93fed740f1543154157 Mon Sep 17 00:00:00 2001 From: Renato Filho Date: Thu, 6 Oct 2011 11:40:54 -0300 Subject: Updated QtSql modue to works with python 2.x and 3.x --- tests/QtSql/qvarianttype_test.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/QtSql/qvarianttype_test.py b/tests/QtSql/qvarianttype_test.py index 7eae67fd8..89364e52b 100644 --- a/tests/QtSql/qvarianttype_test.py +++ b/tests/QtSql/qvarianttype_test.py @@ -1,18 +1,18 @@ '''Test cases for QVariant::Type converter''' import unittest -from PySide.QtCore import * -from PySide.QtSql import * +import py3kcompat as py3k +from PySide.QtSql import QSqlField class QVariantTypeTest(unittest.TestCase): def testQVariantType(self): - f = QSqlField("name", unicode) - self.assertEqual(f.type(), unicode) + f = QSqlField("name", str) + self.assertEqual(f.type(), py3k.unicode) f = QSqlField("name", str) - self.assertEqual(f.type(), unicode) + self.assertEqual(f.type(), py3k.unicode) f = QSqlField("name", "QString") - self.assertEqual(f.type(), unicode) + self.assertEqual(f.type(), py3k.unicode) f = QSqlField("name", "double") self.assertEqual(f.type(), float) @@ -23,8 +23,9 @@ class QVariantTypeTest(unittest.TestCase): f = QSqlField("name", int) self.assertEqual(f.type(), int) - f = QSqlField("name", long) - self.assertEqual(f.type(), int) # long isn't registered in QVariant:Type, just in QMetaType::Type + if not py3k.IS_PY3K: + f = QSqlField("name", long) + self.assertEqual(f.type(), int) # long isn't registered in QVariant:Type, just in QMetaType::Type #f = QSqlField("name", QObject) #self.assertEqual(f.type(), None) -- cgit v1.2.3