diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 13:34:58 +0000 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 13:34:58 +0000 |
| commit | 2623a37852153363335956afab010cb0beb7e74e (patch) | |
| tree | e443a19bb7a87adc2158ef2e32da5c2f3b21936c /Lib/sqlite3/test | |
| parent | 40a92f5c65767d80ebc3b3be2c2ccfc5db3afb7b (diff) | |
| download | cpython-git-2623a37852153363335956afab010cb0beb7e74e.tar.gz | |
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.
........
Diffstat (limited to 'Lib/sqlite3/test')
| -rw-r--r-- | Lib/sqlite3/test/dbapi.py | 4 | ||||
| -rw-r--r-- | Lib/sqlite3/test/types.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py index 401ba79df8..6701c227e8 100644 --- a/Lib/sqlite3/test/dbapi.py +++ b/Lib/sqlite3/test/dbapi.py @@ -44,8 +44,8 @@ class ModuleTests(unittest.TestCase): 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 70d20dcdce..c5ab39bb77 100644 --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -306,7 +306,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): |