Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 401ba79..6701c22 100644
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -44,8 +44,8 @@
sqlite.paramstyle)
def CheckWarning(self):
- self.assert_(issubclass(sqlite.Warning, StandardError),
- "Warning is not a subclass of StandardError")
+ self.assertTrue(issubclass(sqlite.Warning, StandardError),
+ "Warning is not a subclass of StandardError")
def CheckError(self):
self.assertTrue(issubclass(sqlite.Error, StandardError),
diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py
index 70d20dc..c5ab39b 100644
--- a/Lib/sqlite3/test/types.py
+++ b/Lib/sqlite3/test/types.py
@@ -306,7 +306,7 @@
no row returned.
"""
self.cur.execute("select * from test where 0 = 1")
- self.assert_(self.cur.description[0][0] == "x")
+ self.assertEqual(self.cur.description[0][0], "x")
class ObjectAdaptationTests(unittest.TestCase):
def cast(obj):