Modern unittest idioms imported from Python core.

lib/test/factory.py

@@ -142,14 +142,14 @@ def CheckSqliteRowHashCmp(self):
         self.assertTrue(row_1 == row_2)
         self.assertTrue(row_2 != row_3)
 
-        self.failIf(row_1 != row_1)
-        self.failIf(row_1 != row_2)
-        self.failIf(row_2 == row_3)
+        self.assertFalse(row_1 != row_1)
+        self.assertFalse(row_1 != row_2)
+        self.assertFalse(row_2 == row_3)
 
         self.assertEqual(row_1, row_2)
         self.assertEqual(hash(row_1), hash(row_2))
-        self.failIfEqual(row_1, row_3)
-        self.failIfEqual(hash(row_1), hash(row_3))
+        self.assertNotEqual(row_1, row_3)
+        self.assertNotEqual(hash(row_1), hash(row_3))
 
     def tearDown(self):
         self.con.close()

lib/test/py25/py25tests.py

@@ -54,19 +54,19 @@ def CheckContextManagerCommit(self):
             self.con.execute("insert into test(c) values ('foo')")
         self.con.rollback()
         count = self.con.execute("select count(*) from test").fetchone()[0]
-        self.failUnlessEqual(count, 1)
+        self.assertEqual(count, 1)
 
     def CheckContextManagerRollback(self):
         """Is a rollback called in the context manager?"""
         global did_rollback
-        self.failUnlessEqual(did_rollback, False)
+        self.assertEqual(did_rollback, False)
         try:
             with self.con:
                 self.con.execute("insert into test(c) values (4)")
                 self.con.execute("insert into test(c) values (4)")
         except sqlite.IntegrityError:
             pass
-        self.failUnlessEqual(did_rollback, True)
+        self.assertEqual(did_rollback, True)
 
 def suite():
     ctx_suite = unittest.makeSuite(ContextTests, "Check")

lib/test/types.py

@@ -21,9 +21,11 @@
 #    misrepresented as being the original software.
 # 3. This notice may not be removed or altered from any source distribution.
 
-import zlib, datetime
+import datetime
 import unittest
 import pysqlite2.dbapi2 as sqlite
+import zlib
+
 
 class SqliteTypeTests(unittest.TestCase):
     def setUp(self):