From 19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sun, 21 Nov 2010 01:30:29 +0000 Subject: 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. ........ --- Lib/sqlite3/test/dbapi.py | 2 +- Lib/sqlite3/test/types.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Lib/sqlite3') diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py index c0b182286f..fbf3072341 100644 --- a/Lib/sqlite3/test/dbapi.py +++ b/Lib/sqlite3/test/dbapi.py @@ -40,7 +40,7 @@ class ModuleTests(unittest.TestCase): sqlite.paramstyle) def CheckWarning(self): - self.assert_(issubclass(sqlite.Warning, Exception), + self.assertTrue(issubclass(sqlite.Warning, Exception), "Warning is not a subclass of Exception") def CheckError(self): diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py index 8b1d780c32..0940e9b28d 100644 --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -286,7 +286,7 @@ class ColNamesTests(unittest.TestCase): 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): -- cgit v1.2.1