traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade to final version of pysqlite 2.2.0

This commit is contained in:
Anthony Baxter 2006-04-05 18:25:33 +00:00
parent c48c8db110
commit 8e7b490890
11 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_sqlite/cache.c
View File

@ -262,7 +262,7 @@ static PyMethodDef cache_methods[] = {
PyTypeObject NodeType = { PyTypeObject NodeType = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"pysqlite2.dbapi2.Node", /* tp_name */ MODULE_NAME "Node", /* tp_name */
sizeof(Node), /* tp_basicsize */ sizeof(Node), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)node_dealloc, /* tp_dealloc */ (destructor)node_dealloc, /* tp_dealloc */
@ -305,7 +305,7 @@ PyTypeObject NodeType = {
PyTypeObject CacheType = { PyTypeObject CacheType = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"pysqlite2.dbapi2.Cache", /* tp_name */ MODULE_NAME ".Cache", /* tp_name */
sizeof(Cache), /* tp_basicsize */ sizeof(Cache), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)cache_dealloc, /* tp_dealloc */ (destructor)cache_dealloc, /* tp_dealloc */

2
Modules/_sqlite/connection.c
View File

@ -1029,7 +1029,7 @@ static struct PyMemberDef connection_members[] =
PyTypeObject ConnectionType = { PyTypeObject ConnectionType = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"pysqlite2.dbapi2.Connection", /* tp_name */ MODULE_NAME ".Connection", /* tp_name */
sizeof(Connection), /* tp_basicsize */ sizeof(Connection), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)connection_dealloc, /* tp_dealloc */ (destructor)connection_dealloc, /* tp_dealloc */

2
Modules/_sqlite/cursor.c
View File

@ -977,7 +977,7 @@ static struct PyMemberDef cursor_members[] =
PyTypeObject CursorType = { PyTypeObject CursorType = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"pysqlite2.dbapi2.Cursor", /* tp_name */ MODULE_NAME ".Cursor", /* tp_name */
sizeof(Cursor), /* tp_basicsize */ sizeof(Cursor), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)cursor_dealloc, /* tp_dealloc */ (destructor)cursor_dealloc, /* tp_dealloc */

15
Modules/_sqlite/microprotocols.c
View File

@ -55,28 +55,19 @@ int
microprotocols_add(PyTypeObject *type, PyObject *proto, PyObject *cast) microprotocols_add(PyTypeObject *type, PyObject *proto, PyObject *cast)
{ {
PyObject* key; PyObject* key;
int rc;
if (proto == NULL) proto = (PyObject*)&SQLitePrepareProtocolType; if (proto == NULL) proto = (PyObject*)&SQLitePrepareProtocolType;
/*
Dprintf("microprotocols_add: cast %p for (%s, ?)",
cast, type->tp_name);
*/
key = Py_BuildValue("(OO)", (PyObject*)type, proto); key = Py_BuildValue("(OO)", (PyObject*)type, proto);
if (!key) { if (!key) {
return -1; return -1;
} }
if (PyDict_SetItem(psyco_adapters, key, cast) != 0) { rc = PyDict_SetItem(psyco_adapters, key, cast);
Py_DECREF(key);
return -1;
}
Py_DECREF(key); Py_DECREF(key);
return 0; return rc;
} }
/* microprotocols_adapt - adapt an object to the built-in protocol */ /* microprotocols_adapt - adapt an object to the built-in protocol */

22
Modules/_sqlite/module.c
View File

@ -214,56 +214,56 @@ PyMODINIT_FUNC init_sqlite3(void)
/*** Create DB-API Exception hierarchy */ /*** Create DB-API Exception hierarchy */
if (!(Error = PyErr_NewException("sqlite3.Error", PyExc_StandardError, NULL))) { if (!(Error = PyErr_NewException(MODULE_NAME ".Error", PyExc_StandardError, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "Error", Error); PyDict_SetItemString(dict, "Error", Error);
if (!(Warning = PyErr_NewException("sqlite3.Warning", PyExc_StandardError, NULL))) { if (!(Warning = PyErr_NewException(MODULE_NAME ".Warning", PyExc_StandardError, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "Warning", Warning); PyDict_SetItemString(dict, "Warning", Warning);
/* Error subclasses */ /* Error subclasses */
if (!(InterfaceError = PyErr_NewException("sqlite3.InterfaceError", Error, NULL))) { if (!(InterfaceError = PyErr_NewException(MODULE_NAME ".InterfaceError", Error, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "InterfaceError", InterfaceError); PyDict_SetItemString(dict, "InterfaceError", InterfaceError);
if (!(DatabaseError = PyErr_NewException("sqlite3.DatabaseError", Error, NULL))) { if (!(DatabaseError = PyErr_NewException(MODULE_NAME ".DatabaseError", Error, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "DatabaseError", DatabaseError); PyDict_SetItemString(dict, "DatabaseError", DatabaseError);
/* DatabaseError subclasses */ /* DatabaseError subclasses */
if (!(InternalError = PyErr_NewException("sqlite3.InternalError", DatabaseError, NULL))) { if (!(InternalError = PyErr_NewException(MODULE_NAME ".InternalError", DatabaseError, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "InternalError", InternalError); PyDict_SetItemString(dict, "InternalError", InternalError);
if (!(OperationalError = PyErr_NewException("sqlite3.OperationalError", DatabaseError, NULL))) { if (!(OperationalError = PyErr_NewException(MODULE_NAME ".OperationalError", DatabaseError, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "OperationalError", OperationalError); PyDict_SetItemString(dict, "OperationalError", OperationalError);
if (!(ProgrammingError = PyErr_NewException("sqlite3.ProgrammingError", DatabaseError, NULL))) { if (!(ProgrammingError = PyErr_NewException(MODULE_NAME ".ProgrammingError", DatabaseError, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "ProgrammingError", ProgrammingError); PyDict_SetItemString(dict, "ProgrammingError", ProgrammingError);
if (!(IntegrityError = PyErr_NewException("sqlite3.IntegrityError", DatabaseError,NULL))) { if (!(IntegrityError = PyErr_NewException(MODULE_NAME ".IntegrityError", DatabaseError,NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "IntegrityError", IntegrityError); PyDict_SetItemString(dict, "IntegrityError", IntegrityError);
if (!(DataError = PyErr_NewException("sqlite3.DataError", DatabaseError, NULL))) { if (!(DataError = PyErr_NewException(MODULE_NAME ".DataError", DatabaseError, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "DataError", DataError); PyDict_SetItemString(dict, "DataError", DataError);
if (!(NotSupportedError = PyErr_NewException("sqlite3.NotSupportedError", DatabaseError, NULL))) { if (!(NotSupportedError = PyErr_NewException(MODULE_NAME ".NotSupportedError", DatabaseError, NULL))) {
goto error; goto error;
} }
PyDict_SetItemString(dict, "NotSupportedError", NotSupportedError); PyDict_SetItemString(dict, "NotSupportedError", NotSupportedError);
@ -320,6 +320,6 @@ PyMODINIT_FUNC init_sqlite3(void)
error: error:
if (PyErr_Occurred()) if (PyErr_Occurred())
{ {
PyErr_SetString(PyExc_ImportError, "_sqlite3: init failed"); PyErr_SetString(PyExc_ImportError, MODULE_NAME ": init failed");
} }
} }

2
Modules/_sqlite/module.h
View File

@ -25,6 +25,8 @@
#define PYSQLITE_MODULE_H #define PYSQLITE_MODULE_H
#include "Python.h" #include "Python.h"
#define PYSQLITE_VERSION "2.2.0"
extern PyObject* Error; extern PyObject* Error;
extern PyObject* Warning; extern PyObject* Warning;
extern PyObject* InterfaceError; extern PyObject* InterfaceError;

2
Modules/_sqlite/prepare_protocol.c
View File

@ -36,7 +36,7 @@ void prepare_protocol_dealloc(SQLitePrepareProtocol* self)
PyTypeObject SQLitePrepareProtocolType= { PyTypeObject SQLitePrepareProtocolType= {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"pysqlite2.dbapi2.PrepareProtocol", /* tp_name */ MODULE_NAME ".PrepareProtocol", /* tp_name */
sizeof(SQLitePrepareProtocol), /* tp_basicsize */ sizeof(SQLitePrepareProtocol), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)prepare_protocol_dealloc, /* tp_dealloc */ (destructor)prepare_protocol_dealloc, /* tp_dealloc */

2
Modules/_sqlite/row.c
View File

@ -154,7 +154,7 @@ PyMappingMethods row_as_mapping = {
PyTypeObject RowType = { PyTypeObject RowType = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"pysqlite2.dbapi2.Row", /* tp_name */ MODULE_NAME ".Row", /* tp_name */
sizeof(Row), /* tp_basicsize */ sizeof(Row), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)row_dealloc, /* tp_dealloc */ (destructor)row_dealloc, /* tp_dealloc */

2
Modules/_sqlite/statement.c
View File

@ -381,7 +381,7 @@ int check_remaining_sql(const char* tail)
PyTypeObject StatementType = { PyTypeObject StatementType = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"pysqlite2.dbapi2.Statement", /* tp_name */ MODULE_NAME ".Statement", /* tp_name */
sizeof(Statement), /* tp_basicsize */ sizeof(Statement), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)statement_dealloc, /* tp_dealloc */ (destructor)statement_dealloc, /* tp_dealloc */

8
PCbuild/_sqlite3.vcproj
View File

@ -22,7 +22,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=\"2.2.0\"" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\""
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
@ -77,7 +77,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=\"2.2.0\"" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\""
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
@ -135,7 +135,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=\"2.2.0\"" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\""
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -197,7 +197,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=\"2.2.0\"" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\""
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
RuntimeLibrary="2" RuntimeLibrary="2"

7
setup.py
View File

@ -755,11 +755,10 @@ class PyBuildExt(build_ext):
PYSQLITE_VERSION = "2.2.0" PYSQLITE_VERSION = "2.2.0"
sqlite_defines = [] sqlite_defines = []
if sys.platform != "win32": if sys.platform != "win32":
sqlite_defines.append(('PYSQLITE_VERSION', sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
'"%s"' % PYSQLITE_VERSION))
else: else:
sqlite_defines.append(('PYSQLITE_VERSION', sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
'\\"'+PYSQLITE_VERSION+'\\"'))
sqlite_defines.append(('PY_MAJOR_VERSION', sqlite_defines.append(('PY_MAJOR_VERSION',
str(sys.version_info[0]))) str(sys.version_info[0])))
sqlite_defines.append(('PY_MINOR_VERSION', sqlite_defines.append(('PY_MINOR_VERSION',