summaryrefslogtreecommitdiffstats
path: root/Modules/_sqlite/cursor.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-06-26 01:16:24 (GMT)
committerGitHub <noreply@github.com>2019-06-26 01:16:24 (GMT)
commitc6a2320e876354ee62cf8149b849bcff9492d38a (patch)
treed5f5042334eb149bf08a01e7f09b429db0360ff2 /Modules/_sqlite/cursor.c
parented076ed467264b43ed01a8223ca65b133b590919 (diff)
downloadcpython-c6a2320e876354ee62cf8149b849bcff9492d38a.zip
cpython-c6a2320e876354ee62cf8149b849bcff9492d38a.tar.gz
cpython-c6a2320e876354ee62cf8149b849bcff9492d38a.tar.bz2
bpo-37406: sqlite3 raises TypeError for wrong operation type (GH-14386)
The sqlite3 module now raises TypeError, rather than ValueError, if operation argument type is not str: execute(), executemany() and calling a connection.
Diffstat (limited to 'Modules/_sqlite/cursor.c')
-rw-r--r--Modules/_sqlite/cursor.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 01b9dc4..38d94b2 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -384,12 +384,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* args)
if (multiple) {
/* executemany() */
- if (!PyArg_ParseTuple(args, "OO", &operation, &second_argument)) {
- goto error;
- }
-
- if (!PyUnicode_Check(operation)) {
- PyErr_SetString(PyExc_ValueError, "operation parameter must be str");
+ if (!PyArg_ParseTuple(args, "UO", &operation, &second_argument)) {
goto error;
}
@@ -406,12 +401,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* args)
}
} else {
/* execute() */
- if (!PyArg_ParseTuple(args, "O|O", &operation, &second_argument)) {
- goto error;
- }
-
- if (!PyUnicode_Check(operation)) {
- PyErr_SetString(PyExc_ValueError, "operation parameter must be str");
+ if (!PyArg_ParseTuple(args, "U|O", &operation, &second_argument)) {
goto error;
}