Merged revisions 78898 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78898 | victor.stinner | 2010-03-13 04:27:07 +0100 (sam., 13 mars 2010) | 7 lines
sqlite3: Fix a segfault on calling a connection with something else than a
string. Initialize all attributes to be able to call the statement destructor
on error.
Avoid also a duplicate connection in some tests: setUp() does already open a
connection (":memory:").
........
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index 7ed0d92..255bd3f 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -242,8 +242,7 @@
Verifies that running a PRAGMA statement that does an autocommit does
work. This did not work in 2.5.3/2.5.4.
"""
- con = sqlite.connect(":memory:")
- cur = con.cursor()
+ cur = self.con.cursor()
cur.execute("create table foo(bar)")
cur.execute("insert into foo(bar) values (5)")
@@ -263,11 +262,17 @@
def __hash__(self):
raise TypeError()
var = NotHashable()
- con = sqlite.connect(":memory:")
- self.assertRaises(TypeError, con.create_function, var)
- self.assertRaises(TypeError, con.create_aggregate, var)
- self.assertRaises(TypeError, con.set_authorizer, var)
- self.assertRaises(TypeError, con.set_progress_handler, var)
+ self.assertRaises(TypeError, self.con.create_function, var)
+ self.assertRaises(TypeError, self.con.create_aggregate, var)
+ self.assertRaises(TypeError, self.con.set_authorizer, var)
+ self.assertRaises(TypeError, self.con.set_progress_handler, var)
+
+ def CheckConnectionCall(self):
+ """
+ Call a connection with a non-string SQL request: check error handling
+ of the statement constructor.
+ """
+ self.assertRaises(sqlite.Warning, self.con, 1)
def suite():
regression_suite = unittest.makeSuite(RegressionTests, "Check")