Index: Lib/sqlite3/test/dbapi.py =================================================================== --- Lib/sqlite3/test/dbapi.py (revision 83714) +++ Lib/sqlite3/test/dbapi.py (working copy) @@ -24,6 +24,7 @@ import unittest import sys import sqlite3 as sqlite +import exceptions try: import threading except ImportError: @@ -44,8 +45,8 @@ sqlite.paramstyle) def CheckWarning(self): - self.assert_(issubclass(sqlite.Warning, StandardError), - "Warning is not a subclass of StandardError") + self.assert_(issubclass(sqlite.Warning, exceptions.Warning), + "Warning is not a subclass of exceptions.Warning") def CheckError(self): self.assertTrue(issubclass(sqlite.Error, StandardError), Index: Modules/_sqlite/module.c =================================================================== --- Modules/_sqlite/module.c (revision 83714) +++ Modules/_sqlite/module.c (working copy) @@ -343,7 +343,7 @@ } PyDict_SetItemString(dict, "Error", pysqlite_Error); - if (!(pysqlite_Warning = PyErr_NewException(MODULE_NAME ".Warning", PyExc_StandardError, NULL))) { + if (!(pysqlite_Warning = PyErr_NewException(MODULE_NAME ".Warning", PyExc_Warning, NULL))) { goto error; } PyDict_SetItemString(dict, "Warning", pysqlite_Warning);