Mercurial > cpython-lru_cache-weakref
diff Modules/_sqlite/module.c @ 47527:52294af4b663 legacy-trunk
This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 09 Jun 2008 04:58:54 +0000 |
| parents | 4fe192d48960 |
| children | 7b51ea8cc558 |
line wrap: on
line diff
--- a/Modules/_sqlite/module.c Mon Jun 09 01:28:30 2008 +0000 +++ b/Modules/_sqlite/module.c Mon Jun 09 04:58:54 2008 +0000 @@ -137,7 +137,7 @@ /* a basic type is adapted; there's a performance optimization if that's not the case * (99 % of all usages) */ if (type == &PyInt_Type || type == &PyLong_Type || type == &PyFloat_Type - || type == &PyBytes_Type || type == &PyUnicode_Type || type == &PyBuffer_Type) { + || type == &PyString_Type || type == &PyUnicode_Type || type == &PyBuffer_Type) { pysqlite_BaseTypeAdapted = 1; } @@ -367,13 +367,13 @@ Py_DECREF(tmp_obj); } - if (!(tmp_obj = PyBytes_FromString(PYSQLITE_VERSION))) { + if (!(tmp_obj = PyString_FromString(PYSQLITE_VERSION))) { goto error; } PyDict_SetItemString(dict, "version", tmp_obj); Py_DECREF(tmp_obj); - if (!(tmp_obj = PyBytes_FromString(sqlite3_libversion()))) { + if (!(tmp_obj = PyString_FromString(sqlite3_libversion()))) { goto error; } PyDict_SetItemString(dict, "sqlite_version", tmp_obj);