cpython-lru_cache-weakref: Modules/_sqlite/module.c annotate

annotate Modules/_sqlite/module.c @ 87690:66c1c9f32567 default tip

Add use_weakref option to functools.lru_cache The use_weakref option makes lru_cache create weak references to the function arguments when creating the cache key, which prevents them from staying in the memory forever even after all other references to them are gone. This is a proof of concept for http://bugs.python.org/issue19859

author	Radomir Dopieralski <devel@sheep.art.pl>
date	Tue, 03 Dec 2013 16:02:48 +0100
parents	f13bb1e40fbc
children

rev	line source
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	1 /* module.c - the module itself
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	2 *
64423 e9cd15d539e1 Welcome to the UTF-8 world. Florent Xicluna <florent.xicluna@gmail.com> parents: 61466 diff changeset	3 * Copyright (C) 2004-2010 Gerhard Häring <gh@ghaering.de>
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	4 *
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	5 * This file is part of pysqlite.
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	6 *
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	7 * This software is provided 'as-is', without any express or implied
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	8 * warranty. In no event will the authors be held liable for any damages
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	9 * arising from the use of this software.
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	10 *
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	11 * Permission is granted to anyone to use this software for any purpose,
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	12 * including commercial applications, and to alter it and redistribute it
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	13 * freely, subject to the following restrictions:
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	14 *
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	15 * 1. The origin of this software must not be misrepresented; you must not
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	16 * claim that you wrote the original software. If you use this software
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	17 * in a product, an acknowledgment in the product documentation would be
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	18 * appreciated but is not required.
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	19 * 2. Altered source versions must be plainly marked as such, and must not be
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	20 * misrepresented as being the original software.
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	21 * 3. This notice may not be removed or altered from any source distribution.
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	22 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	23
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	24 #include "connection.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	25 #include "statement.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	26 #include "cursor.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	27 #include "cache.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	28 #include "prepare_protocol.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	29 #include "microprotocols.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	30 #include "row.h"
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	31
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	32 #if SQLITE_VERSION_NUMBER >= 3003003
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	33 #define HAVE_SHARED_CACHE
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	34 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	35
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	36 /* static objects at module-level */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	37
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	38 PyObject* pysqlite_Error, pysqlite_Warning, pysqlite_InterfaceError, *pysqlite_DatabaseError,
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	39 pysqlite_InternalError, pysqlite_OperationalError, *pysqlite_ProgrammingError,
74850 0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	40 pysqlite_IntegrityError, pysqlite_DataError, *pysqlite_NotSupportedError;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	41
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	42 PyObject* converters;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	43 int _enable_callback_tracebacks;
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	44 int pysqlite_BaseTypeAdapted;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	45
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	46 static PyObject* module_connect(PyObject* self, PyObject* args, PyObject*
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	47 kwargs)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	48 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	49 /* Python seems to have no way of extracting a single keyword-arg at
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	50 * C-level, so this code is redundant with the one in connection_init in
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	51 * connection.c and must always be copied from there ... */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	52
82113 f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	53 static char *kwlist[] = {
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	54 "database", "timeout", "detect_types", "isolation_level",
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	55 "check_same_thread", "factory", "cached_statements", "uri",
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	56 NULL
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	57 };
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	58 char* database;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	59 int detect_types = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	60 PyObject* isolation_level;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	61 PyObject* factory = NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	62 int check_same_thread = 1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	63 int cached_statements;
82113 f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	64 int uri = 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	65 double timeout = 5.0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	66
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	67 PyObject* result;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	68
82113 f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	69 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s\|diOiOip", kwlist,
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	70 &database, &timeout, &detect_types,
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	71 &isolation_level, &check_same_thread,
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	72 &factory, &cached_statements, &uri))
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	73 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	74 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	75 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	76
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	77 if (factory == NULL) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	78 factory = (PyObject*)&pysqlite_ConnectionType;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	79 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	80
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	81 result = PyObject_Call(factory, args, kwargs);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	82
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	83 return result;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	84 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	85
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	86 PyDoc_STRVAR(module_connect_doc,
82113 f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	87 "connect(database[, timeout, detect_types, isolation_level,\n\
f13bb1e40fbc Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. Antoine Pitrou <solipsis@pitrou.net> parents: 74850 diff changeset	88 check_same_thread, factory, cached_statements, uri])\n\
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	89 \n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	90 Opens a connection to the SQLite database file database. You can use\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	91 \":memory:\" to open a database connection to a database that resides in\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	92 RAM instead of on disk.");
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	93
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	94 static PyObject* module_complete(PyObject* self, PyObject* args, PyObject*
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	95 kwargs)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	96 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	97 static char *kwlist[] = {"statement", NULL, NULL};
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	98 char* statement;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	99
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	100 PyObject* result;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	101
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	102 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &statement))
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	103 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	104 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	105 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	106
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	107 if (sqlite3_complete(statement)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	108 result = Py_True;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	109 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	110 result = Py_False;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	111 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	112
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	113 Py_INCREF(result);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	114
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	115 return result;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	116 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	117
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	118 PyDoc_STRVAR(module_complete_doc,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	119 "complete_statement(sql)\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	120 \n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	121 Checks if a string contains a complete SQL statement. Non-standard.");
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	122
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	123 #ifdef HAVE_SHARED_CACHE
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	124 static PyObject* module_enable_shared_cache(PyObject* self, PyObject* args, PyObject*
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	125 kwargs)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	126 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	127 static char *kwlist[] = {"do_enable", NULL, NULL};
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	128 int do_enable;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	129 int rc;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	130
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	131 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &do_enable))
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	132 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	133 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	134 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	135
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	136 rc = sqlite3_enable_shared_cache(do_enable);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	137
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	138 if (rc != SQLITE_OK) {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	139 PyErr_SetString(pysqlite_OperationalError, "Changing the shared_cache flag failed");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	140 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	141 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	142 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	143 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	144 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	145 }
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	146
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	147 PyDoc_STRVAR(module_enable_shared_cache_doc,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	148 "enable_shared_cache(do_enable)\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	149 \n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	150 Enable or disable shared cache mode for the calling thread.\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	151 Experimental/Non-standard.");
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	152 #endif /* HAVE_SHARED_CACHE */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	153
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	154 static PyObject* module_register_adapter(PyObject* self, PyObject* args)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	155 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	156 PyTypeObject* type;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	157 PyObject* caster;
48563 b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48410 diff changeset	158 int rc;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	159
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	160 if (!PyArg_ParseTuple(args, "OO", &type, &caster)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	161 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	162 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	163
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	164 /* a basic type is adapted; there's a performance optimization if that's not the case
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	165 * (99 % of all usages) */
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	166 if (type == &PyLong_Type \|\| type == &PyFloat_Type
47300 96b34263e448 Renamed PyBytes to PyByteArray Christian Heimes <christian@cheimes.de> parents: 46178 diff changeset	167 \|\| type == &PyUnicode_Type \|\| type == &PyByteArray_Type) {
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	168 pysqlite_BaseTypeAdapted = 1;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	169 }
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	170
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48563 diff changeset	171 rc = pysqlite_microprotocols_add(type, (PyObject*)&pysqlite_PrepareProtocolType, caster);
48563 b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48410 diff changeset	172 if (rc == -1)
b51cd5d3795c Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from Georg Brandl <georg@python.org> parents: 48410 diff changeset	173 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	174
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	175 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	176 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	177 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	178
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	179 PyDoc_STRVAR(module_register_adapter_doc,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	180 "register_adapter(type, callable)\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	181 \n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	182 Registers an adapter with pysqlite's adapter registry. Non-standard.");
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	183
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	184 static PyObject* module_register_converter(PyObject* self, PyObject* args)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	185 {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	186 PyObject* orig_name;
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	187 PyObject* name = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	188 PyObject* callable;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	189 PyObject* retval = NULL;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	190 _Py_IDENTIFIER(upper);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	191
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43694 diff changeset	192 if (!PyArg_ParseTuple(args, "UO", &orig_name, &callable)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	193 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	194 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	195
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	196 /* convert the name to upper case */
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 68257 diff changeset	197 name = _PyObject_CallMethodId(orig_name, &PyId_upper, "");
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	198 if (!name) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	199 goto error;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	200 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	201
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	202 if (PyDict_SetItem(converters, name, callable) != 0) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	203 goto error;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	204 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	205
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	206 Py_INCREF(Py_None);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	207 retval = Py_None;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	208 error:
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	209 Py_XDECREF(name);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	210 return retval;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	211 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	212
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	213 PyDoc_STRVAR(module_register_converter_doc,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	214 "register_converter(typename, callable)\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	215 \n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	216 Registers a converter with pysqlite. Non-standard.");
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	217
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	218 static PyObject* enable_callback_tracebacks(PyObject* self, PyObject* args)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	219 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	220 if (!PyArg_ParseTuple(args, "i", &_enable_callback_tracebacks)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	221 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	222 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	223
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	224 Py_INCREF(Py_None);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	225 return Py_None;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	226 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	227
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	228 PyDoc_STRVAR(enable_callback_tracebacks_doc,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	229 "enable_callback_tracebacks(flag)\n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	230 \n\
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	231 Enable or disable callback functions throwing errors to stderr.");
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	232
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	233 static void converters_init(PyObject* dict)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	234 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	235 converters = PyDict_New();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	236 if (!converters) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	237 return;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	238 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	239
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	240 PyDict_SetItemString(dict, "converters", converters);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	241 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	242
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	243 static PyMethodDef module_methods[] = {
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	244 {"connect", (PyCFunction)module_connect,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	245 METH_VARARGS \| METH_KEYWORDS, module_connect_doc},
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	246 {"complete_statement", (PyCFunction)module_complete,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	247 METH_VARARGS \| METH_KEYWORDS, module_complete_doc},
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	248 #ifdef HAVE_SHARED_CACHE
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	249 {"enable_shared_cache", (PyCFunction)module_enable_shared_cache,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	250 METH_VARARGS \| METH_KEYWORDS, module_enable_shared_cache_doc},
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	251 #endif
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	252 {"register_adapter", (PyCFunction)module_register_adapter,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	253 METH_VARARGS, module_register_adapter_doc},
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	254 {"register_converter", (PyCFunction)module_register_converter,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	255 METH_VARARGS, module_register_converter_doc},
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48563 diff changeset	256 {"adapt", (PyCFunction)pysqlite_adapt, METH_VARARGS,
8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48563 diff changeset	257 pysqlite_adapt_doc},
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	258 {"enable_callback_tracebacks", (PyCFunction)enable_callback_tracebacks,
81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	259 METH_VARARGS, enable_callback_tracebacks_doc},
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	260 {NULL, NULL}
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	261 };
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	262
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	263 struct _IntConstantPair {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	264 char* constant_name;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	265 int constant_value;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	266 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	267
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	268 typedef struct _IntConstantPair IntConstantPair;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	269
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	270 static IntConstantPair _int_constants[] = {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	271 {"PARSE_DECLTYPES", PARSE_DECLTYPES},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	272 {"PARSE_COLNAMES", PARSE_COLNAMES},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	273
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	274 {"SQLITE_OK", SQLITE_OK},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	275 {"SQLITE_DENY", SQLITE_DENY},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	276 {"SQLITE_IGNORE", SQLITE_IGNORE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	277 {"SQLITE_CREATE_INDEX", SQLITE_CREATE_INDEX},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	278 {"SQLITE_CREATE_TABLE", SQLITE_CREATE_TABLE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	279 {"SQLITE_CREATE_TEMP_INDEX", SQLITE_CREATE_TEMP_INDEX},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	280 {"SQLITE_CREATE_TEMP_TABLE", SQLITE_CREATE_TEMP_TABLE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	281 {"SQLITE_CREATE_TEMP_TRIGGER", SQLITE_CREATE_TEMP_TRIGGER},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	282 {"SQLITE_CREATE_TEMP_VIEW", SQLITE_CREATE_TEMP_VIEW},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	283 {"SQLITE_CREATE_TRIGGER", SQLITE_CREATE_TRIGGER},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	284 {"SQLITE_CREATE_VIEW", SQLITE_CREATE_VIEW},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	285 {"SQLITE_DELETE", SQLITE_DELETE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	286 {"SQLITE_DROP_INDEX", SQLITE_DROP_INDEX},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	287 {"SQLITE_DROP_TABLE", SQLITE_DROP_TABLE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	288 {"SQLITE_DROP_TEMP_INDEX", SQLITE_DROP_TEMP_INDEX},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	289 {"SQLITE_DROP_TEMP_TABLE", SQLITE_DROP_TEMP_TABLE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	290 {"SQLITE_DROP_TEMP_TRIGGER", SQLITE_DROP_TEMP_TRIGGER},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	291 {"SQLITE_DROP_TEMP_VIEW", SQLITE_DROP_TEMP_VIEW},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	292 {"SQLITE_DROP_TRIGGER", SQLITE_DROP_TRIGGER},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	293 {"SQLITE_DROP_VIEW", SQLITE_DROP_VIEW},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	294 {"SQLITE_INSERT", SQLITE_INSERT},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	295 {"SQLITE_PRAGMA", SQLITE_PRAGMA},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	296 {"SQLITE_READ", SQLITE_READ},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	297 {"SQLITE_SELECT", SQLITE_SELECT},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	298 {"SQLITE_TRANSACTION", SQLITE_TRANSACTION},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	299 {"SQLITE_UPDATE", SQLITE_UPDATE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	300 {"SQLITE_ATTACH", SQLITE_ATTACH},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	301 {"SQLITE_DETACH", SQLITE_DETACH},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	302 #if SQLITE_VERSION_NUMBER >= 3002001
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	303 {"SQLITE_ALTER_TABLE", SQLITE_ALTER_TABLE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	304 {"SQLITE_REINDEX", SQLITE_REINDEX},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	305 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	306 #if SQLITE_VERSION_NUMBER >= 3003000
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	307 {"SQLITE_ANALYZE", SQLITE_ANALYZE},
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	308 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	309 {(char*)NULL, 0}
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	310 };
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	311
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	312
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	313 static struct PyModuleDef _sqlite3module = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	314 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	315 "_sqlite3",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	316 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	317 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	318 module_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	319 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	320 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	321 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	322 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	323 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	324
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	325 PyMODINIT_FUNC PyInit__sqlite3(void)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	326 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	327 PyObject module, dict;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	328 PyObject *tmp_obj;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	329 int i;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	330
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	331 module = PyModule_Create(&_sqlite3module);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	332
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	333 if (!module \|\|
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	334 (pysqlite_row_setup_types() < 0) \|\|
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	335 (pysqlite_cursor_setup_types() < 0) \|\|
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	336 (pysqlite_connection_setup_types() < 0) \|\|
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	337 (pysqlite_cache_setup_types() < 0) \|\|
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	338 (pysqlite_statement_setup_types() < 0) \|\|
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	339 (pysqlite_prepare_protocol_setup_types() < 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	340 ) {
67865 4355212fe2c4 Merged revisions 88337 via svnmerge from Brett Cannon <bcannon@gmail.com> parents: 61467 diff changeset	341 Py_XDECREF(module);
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	342 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	343 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	344
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	345 Py_INCREF(&pysqlite_ConnectionType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	346 PyModule_AddObject(module, "Connection", (PyObject*) &pysqlite_ConnectionType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	347 Py_INCREF(&pysqlite_CursorType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	348 PyModule_AddObject(module, "Cursor", (PyObject*) &pysqlite_CursorType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	349 Py_INCREF(&pysqlite_CacheType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	350 PyModule_AddObject(module, "Statement", (PyObject*)&pysqlite_StatementType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	351 Py_INCREF(&pysqlite_StatementType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	352 PyModule_AddObject(module, "Cache", (PyObject*) &pysqlite_CacheType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	353 Py_INCREF(&pysqlite_PrepareProtocolType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	354 PyModule_AddObject(module, "PrepareProtocol", (PyObject*) &pysqlite_PrepareProtocolType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	355 Py_INCREF(&pysqlite_RowType);
47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	356 PyModule_AddObject(module, "Row", (PyObject*) &pysqlite_RowType);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	357
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	358 if (!(dict = PyModule_GetDict(module))) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	359 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	360 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	361
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	362 /*** Create DB-API Exception hierarchy */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	363
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 40643 diff changeset	364 if (!(pysqlite_Error = PyErr_NewException(MODULE_NAME ".Error", PyExc_Exception, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	365 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	366 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	367 PyDict_SetItemString(dict, "Error", pysqlite_Error);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	368
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 40643 diff changeset	369 if (!(pysqlite_Warning = PyErr_NewException(MODULE_NAME ".Warning", PyExc_Exception, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	370 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	371 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	372 PyDict_SetItemString(dict, "Warning", pysqlite_Warning);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	373
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	374 /* Error subclasses */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	375
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	376 if (!(pysqlite_InterfaceError = PyErr_NewException(MODULE_NAME ".InterfaceError", pysqlite_Error, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	377 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	378 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	379 PyDict_SetItemString(dict, "InterfaceError", pysqlite_InterfaceError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	380
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	381 if (!(pysqlite_DatabaseError = PyErr_NewException(MODULE_NAME ".DatabaseError", pysqlite_Error, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	382 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	383 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	384 PyDict_SetItemString(dict, "DatabaseError", pysqlite_DatabaseError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	385
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	386 /* pysqlite_DatabaseError subclasses */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	387
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	388 if (!(pysqlite_InternalError = PyErr_NewException(MODULE_NAME ".InternalError", pysqlite_DatabaseError, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	389 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	390 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	391 PyDict_SetItemString(dict, "InternalError", pysqlite_InternalError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	392
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	393 if (!(pysqlite_OperationalError = PyErr_NewException(MODULE_NAME ".OperationalError", pysqlite_DatabaseError, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	394 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	395 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	396 PyDict_SetItemString(dict, "OperationalError", pysqlite_OperationalError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	397
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	398 if (!(pysqlite_ProgrammingError = PyErr_NewException(MODULE_NAME ".ProgrammingError", pysqlite_DatabaseError, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	399 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	400 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	401 PyDict_SetItemString(dict, "ProgrammingError", pysqlite_ProgrammingError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	402
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	403 if (!(pysqlite_IntegrityError = PyErr_NewException(MODULE_NAME ".IntegrityError", pysqlite_DatabaseError,NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	404 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	405 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	406 PyDict_SetItemString(dict, "IntegrityError", pysqlite_IntegrityError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	407
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	408 if (!(pysqlite_DataError = PyErr_NewException(MODULE_NAME ".DataError", pysqlite_DatabaseError, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	409 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	410 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	411 PyDict_SetItemString(dict, "DataError", pysqlite_DataError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	412
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	413 if (!(pysqlite_NotSupportedError = PyErr_NewException(MODULE_NAME ".NotSupportedError", pysqlite_DatabaseError, NULL))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	414 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	415 }
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	416 PyDict_SetItemString(dict, "NotSupportedError", pysqlite_NotSupportedError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	417
74850 0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	418 /* In Python 2.x, setting Connection.text_factory to
0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	419 OptimizedUnicode caused Unicode objects to be returned for
0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	420 non-ASCII data and bytestrings to be returned for ASCII data.
0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	421 Now OptimizedUnicode is an alias for str, so it has no
0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	422 effect. */
0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	423 Py_INCREF((PyObject*)&PyUnicode_Type);
0fc10a33eb4c Undocument and clean up sqlite3.OptimizedUnicode Petri Lehtinen <petri@digip.org> parents: 72925 diff changeset	424 PyDict_SetItemString(dict, "OptimizedUnicode", (PyObject*)&PyUnicode_Type);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	425
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	426 /* Set integer constants */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	427 for (i = 0; _int_constants[i].constant_name != 0; i++) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	428 tmp_obj = PyLong_FromLong(_int_constants[i].constant_value);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	429 if (!tmp_obj) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	430 goto error;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	431 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	432 PyDict_SetItemString(dict, _int_constants[i].constant_name, tmp_obj);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	433 Py_DECREF(tmp_obj);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	434 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	435
43694 b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 42084 diff changeset	436 if (!(tmp_obj = PyUnicode_FromString(PYSQLITE_VERSION))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	437 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	438 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	439 PyDict_SetItemString(dict, "version", tmp_obj);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	440 Py_DECREF(tmp_obj);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	441
43694 b102b8361d5e Use unicode in more places. Fixes a problem with str8 + str in test. Neal Norwitz <nnorwitz@gmail.com> parents: 42084 diff changeset	442 if (!(tmp_obj = PyUnicode_FromString(sqlite3_libversion()))) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	443 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	444 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	445 PyDict_SetItemString(dict, "sqlite_version", tmp_obj);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	446 Py_DECREF(tmp_obj);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	447
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	448 /* initialize microprotocols layer */
49178 8f886acaa142 Merged revisions 66394,66404,66412,66414,66424-66436 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48563 diff changeset	449 pysqlite_microprotocols_init(dict);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	450
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	451 /* initialize the default converters */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	452 converters_init(dict);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	453
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	454 _enable_callback_tracebacks = 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	455
46178 e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	456 pysqlite_BaseTypeAdapted = 0;
e06e08e8fdce Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally Gerhard Häring <gh@ghaering.de> parents: 44099 diff changeset	457
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	458 /* Original comment from _bsddb.c in the Python core. This is also still
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	459 * needed nowadays for Python 2.3/2.4.
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	460 *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	461 * PyEval_InitThreads is called here due to a quirk in python 1.5
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	462 * - 2.2.1 (at least) according to Russell Williamson <merel@wt.net>:
48410 81fd8a8baa9a Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	463 * The global interpreter lock is not initialized until the first
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	464 * thread is created using thread.start_new_thread() or fork() is
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	465 * called. that would cause the ALLOW_THREADS here to segfault due
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	466 * to a null pointer reference if no threads or child processes
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	467 * have been created. This works around that and is a no-op if
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	468 * threads have already been initialized.
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	469 * (see pybsddb-users mailing list post on 2002-08-07)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	470 */
52870 98f42392835b Merge revision 71222 from trunk: #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 49178 diff changeset	471 #ifdef WITH_THREAD
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	472 PyEval_InitThreads();
52870 98f42392835b Merge revision 71222 from trunk: #5615: make it possible to configure --without-threads again. Georg Brandl <georg@python.org> parents: 49178 diff changeset	473 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	474
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	475 error:
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	476 if (PyErr_Occurred())
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	477 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	478 PyErr_SetString(PyExc_ImportError, MODULE_NAME ": init failed");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	479 Py_DECREF(module);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52870 diff changeset	480 module = NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	481 }
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47300 diff changeset	482 return module;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: diff changeset	483 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_sqlite/module.c @ 87690:66c1c9f32567 default tip