summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-03-21 20:29:20 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-03-21 20:29:20 (GMT)
commit09e4697ad1c759138aa4c576b97120775e90313b (patch)
tree21139e6b70f9e453e5e4ba1be39529f8be96d178 /Lib
parent8a685f7184c543bf8515ffcc2597246c0149fbca (diff)
downloadcpython-09e4697ad1c759138aa4c576b97120775e90313b.zip
cpython-09e4697ad1c759138aa4c576b97120775e90313b.tar.gz
cpython-09e4697ad1c759138aa4c576b97120775e90313b.tar.bz2
Merged revisions 78899 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78899 | victor.stinner | 2010-03-13 04:28:34 +0100 (sam., 13 mars 2010) | 14 lines 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:"). ........ ................
Diffstat (limited to 'Lib')
-rw-r--r--Lib/sqlite3/test/regression.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index 2e61acf..da44551 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -176,6 +176,13 @@ class RegressionTests(unittest.TestCase):
class MyStr(str): pass
self.con.execute("select ?", (MyStr("abc"),))
+ 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")
return unittest.TestSuite((regression_suite,))