mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use unicode in more places. Fixes a problem with str8 + str in test.

Browse source
This commit is contained in:
Neal Norwitz 2007-10-27 02:50:52 +00:00
parent ae404e2e0a
commit efee9f5f1d
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_sqlite/connection.c
View file

@ -87,7 +87,7 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
} }
if (!isolation_level) { if (!isolation_level) {
isolation_level = PyString_FromString(""); isolation_level = PyUnicode_FromString("");
if (!isolation_level) { if (!isolation_level) {
return -1; return -1;
} }
@ -828,24 +828,28 @@ static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, Py
self->inTransaction = 0; self->inTransaction = 0;
} else { } else {
const char *statement;
Py_ssize_t size;
Py_INCREF(isolation_level); Py_INCREF(isolation_level);
self->isolation_level = isolation_level; self->isolation_level = isolation_level;
begin_statement = PyString_FromString("BEGIN "); begin_statement = PyUnicode_FromString("BEGIN ");
if (!begin_statement) { if (!begin_statement) {
return -1; return -1;
} }
PyString_Concat(&begin_statement, isolation_level); PyUnicode_Concat(begin_statement, isolation_level);
if (!begin_statement) { if (!begin_statement) {
return -1; return -1;
} }
self->begin_statement = PyMem_Malloc(PyString_Size(begin_statement) + 2); statement = PyUnicode_AsStringAndSize(begin_statement, &size);
self->begin_statement = PyMem_Malloc(size + 2);
if (!self->begin_statement) { if (!self->begin_statement) {
return -1; return -1;
} }
strcpy(self->begin_statement, PyString_AsString(begin_statement)); strcpy(self->begin_statement, statement);
Py_DECREF(begin_statement); Py_DECREF(begin_statement);
} }

4
Modules/_sqlite/module.c
View file

@ -359,13 +359,13 @@ PyMODINIT_FUNC init_sqlite3(void)
Py_DECREF(tmp_obj); Py_DECREF(tmp_obj);
} }
if (!(tmp_obj = PyString_FromString(PYSQLITE_VERSION))) { if (!(tmp_obj = PyUnicode_FromString(PYSQLITE_VERSION))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "version", tmp_obj); PyDict_SetItemString(dict, "version", tmp_obj);
Py_DECREF(tmp_obj); Py_DECREF(tmp_obj);
if (!(tmp_obj = PyString_FromString(sqlite3_libversion()))) { if (!(tmp_obj = PyUnicode_FromString(sqlite3_libversion()))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "sqlite_version", tmp_obj); PyDict_SetItemString(dict, "sqlite_version", tmp_obj);