diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
commit | f95a1b3c53bdd678b64aa608d4375660033460c3 (patch) | |
tree | a8bee40b1b14e28ff5978ea519f3035a3c399912 /Modules/_sqlite | |
parent | bd250300191133d276a71b395b6428081bf825b8 (diff) | |
download | cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.zip cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.gz cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.bz2 |
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
Diffstat (limited to 'Modules/_sqlite')
-rw-r--r-- | Modules/_sqlite/module.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index ebe6019..db55eaa 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -64,7 +64,7 @@ static PyObject* module_connect(PyObject* self, PyObject* args, PyObject* if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|diOiOi", kwlist, &database, &timeout, &detect_types, &isolation_level, &check_same_thread, &factory, &cached_statements)) { - return NULL; + return NULL; } if (factory == NULL) { @@ -93,7 +93,7 @@ static PyObject* module_complete(PyObject* self, PyObject* args, PyObject* if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &statement)) { - return NULL; + return NULL; } if (sqlite3_complete(statement)) { @@ -122,7 +122,7 @@ static PyObject* module_enable_shared_cache(PyObject* self, PyObject* args, PyOb if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &do_enable)) { - return NULL; + return NULL; } rc = sqlite3_enable_shared_cache(do_enable); @@ -302,15 +302,15 @@ static IntConstantPair _int_constants[] = { static struct PyModuleDef _sqlite3module = { - PyModuleDef_HEAD_INIT, - "_sqlite3", - NULL, - -1, - module_methods, - NULL, - NULL, - NULL, - NULL + PyModuleDef_HEAD_INIT, + "_sqlite3", + NULL, + -1, + module_methods, + NULL, + NULL, + NULL, + NULL }; PyMODINIT_FUNC PyInit__sqlite3(void) @@ -329,7 +329,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void) (pysqlite_statement_setup_types() < 0) || (pysqlite_prepare_protocol_setup_types() < 0) ) { - Py_DECREF(module); + Py_DECREF(module); return NULL; } @@ -448,7 +448,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void) /* Original comment from _bsddb.c in the Python core. This is also still * needed nowadays for Python 2.3/2.4. - * + * * PyEval_InitThreads is called here due to a quirk in python 1.5 * - 2.2.1 (at least) according to Russell Williamson <merel@wt.net>: * The global interpreter lock is not initialized until the first @@ -467,8 +467,8 @@ error: if (PyErr_Occurred()) { PyErr_SetString(PyExc_ImportError, MODULE_NAME ": init failed"); - Py_DECREF(module); - module = NULL; + Py_DECREF(module); + module = NULL; } return module; } |