mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-91922: Fix sqlite connection on nonstardard locales and paths (GH-92926)

Browse source
This commit is contained in:
Serhiy Storchaka 2022-05-20 11:53:05 +03:00 • committed by GitHub
parent 0e12781ad9
commit d853758092
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/_sqlite/clinic/connection.c.h generated
View file

@ -3,9 +3,9 @@ preserve
[clinic start generated code]*/
static int
pysqlite_connection_init_impl(pysqlite_Connection *self,
const char *database, double timeout,
int detect_types, const char *isolation_level,
pysqlite_connection_init_impl(pysqlite_Connection *self, PyObject *database,
double timeout, int detect_types,
const char *isolation_level,
int check_same_thread, PyObject *factory,
int cache_size, int uri);
@ -19,7 +19,7 @@ pysqlite_connection_init(PyObject *self, PyObject *args, PyObject *kwargs)
PyObject * const *fastargs;
Py_ssize_t nargs = PyTuple_GET_SIZE(args);
Py_ssize_t noptargs = nargs + (kwargs ? PyDict_GET_SIZE(kwargs) : 0) - 1;
const char *database = NULL;
PyObject *database;
double timeout = 5.0;
int detect_types = 0;
const char *isolation_level = "";
@ -32,9 +32,7 @@ pysqlite_connection_init(PyObject *self, PyObject *args, PyObject *kwargs)
if (!fastargs) {
goto exit;
}
if (!clinic_fsconverter(fastargs[0], &database)) {
goto exit;
}
database = fastargs[0];
if (!noptargs) {
goto skip_optional_pos;
}
@ -102,9 +100,6 @@ skip_optional_pos:
return_value = pysqlite_connection_init_impl((pysqlite_Connection *)self, database, timeout, detect_types, isolation_level, check_same_thread, factory, cache_size, uri);
exit:
/* Cleanup for database */
PyMem_Free((void *)database);
return return_value;
}
@ -1236,4 +1231,4 @@ exit:
#ifndef DESERIALIZE_METHODDEF
#define DESERIALIZE_METHODDEF
#endif /* !defined(DESERIALIZE_METHODDEF) */
/*[clinic end generated code: output=d21767843c480a10 input=a9049054013a1b77]*/
/*[clinic end generated code: output=fb8908674e9f25ff input=a9049054013a1b77]*/