--- a/test/unittest_dbapi.py	Fri Sep 24 18:20:57 2010 +0200
+++ b/test/unittest_dbapi.py	Fri Sep 24 18:20:59 2010 +0200
@@ -29,40 +29,40 @@
 
     def test_public_repo_api(self):
         cnx = self.login('anon')
-        self.assertEquals(cnx.get_schema(), self.repo.schema)
-        self.assertEquals(cnx.source_defs(), {'system': {'adapter': 'native', 'uri': 'system'}})
+        self.assertEqual(cnx.get_schema(), self.repo.schema)
+        self.assertEqual(cnx.source_defs(), {'system': {'adapter': 'native', 'uri': 'system'}})
         self.restore_connection() # proper way to close cnx
         self.assertRaises(ProgrammingError, cnx.get_schema)
         self.assertRaises(ProgrammingError, cnx.source_defs)
 
     def test_db_api(self):
         cnx = self.login('anon')
-        self.assertEquals(cnx.rollback(), None)
-        self.assertEquals(cnx.commit(), None)
+        self.assertEqual(cnx.rollback(), None)
+        self.assertEqual(cnx.commit(), None)
         self.restore_connection() # proper way to close cnx
-        #self.assertEquals(cnx.close(), None)
+        #self.assertEqual(cnx.close(), None)
         self.assertRaises(ProgrammingError, cnx.rollback)
         self.assertRaises(ProgrammingError, cnx.commit)
         self.assertRaises(ProgrammingError, cnx.close)
 
     def test_api(self):
         cnx = self.login('anon')
-        self.assertEquals(cnx.user(None).login, 'anon')
-        self.assertEquals(cnx.describe(1), (u'CWGroup', u'system', None))
+        self.assertEqual(cnx.user(None).login, 'anon')
+        self.assertEqual(cnx.describe(1), (u'CWGroup', u'system', None))
         self.restore_connection() # proper way to close cnx
         self.assertRaises(ProgrammingError, cnx.user, None)
         self.assertRaises(ProgrammingError, cnx.describe, 1)
 
     def test_shared_data_api(self):
         cnx = self.login('anon')
-        self.assertEquals(cnx.get_shared_data('data'), None)
+        self.assertEqual(cnx.get_shared_data('data'), None)
         cnx.set_shared_data('data', 4)
-        self.assertEquals(cnx.get_shared_data('data'), 4)
+        self.assertEqual(cnx.get_shared_data('data'), 4)
         cnx.get_shared_data('data', pop=True)
         cnx.get_shared_data('whatever', pop=True)
-        self.assertEquals(cnx.get_shared_data('data'), None)
+        self.assertEqual(cnx.get_shared_data('data'), None)
         cnx.set_shared_data('data', 4)
-        self.assertEquals(cnx.get_shared_data('data'), 4)
+        self.assertEqual(cnx.get_shared_data('data'), 4)
         self.restore_connection() # proper way to close cnx
         self.assertRaises(ProgrammingError, cnx.check)
         self.assertRaises(ProgrammingError, cnx.set_shared_data, 'data', 0)