diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 01:30:29 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 01:30:29 (GMT) |
| commit | 19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee (patch) | |
| tree | 596b5a2c45b058ea3e0cdc49cb7539a21410b98d /Lib/sqlite3 | |
| parent | b65b4937e20be4a2d3311326909c77bbf2e1c4cd (diff) | |
| download | cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.zip cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.gz cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.bz2 | |
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')
| -rw-r--r-- | Lib/sqlite3/test/dbapi.py | 2 | ||||
| -rw-r--r-- | Lib/sqlite3/test/types.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py index c0b1822..fbf3072 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 8b1d780..0940e9b 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): |