psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-22 17:06:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

General cleanup of module init shenanigans

Browse Source 
Pass around the module instead of its dict (getting the latter is fast
if needed), mark function raising with negative results, check all errors,
consistent names...
This commit is contained in:
Daniele Varrazzo 2019-01-22 13:54:06 +00:00
parent 66d5c6da07
commit 65a2a18a1b
4 changed files with 95 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
psycopg/microprotocols.c
View File

@ -38,15 +38,19 @@ PyObject *psyco_adapters;
/* microprotocols_init - initialize the adapters dictionary */ /* microprotocols_init - initialize the adapters dictionary */
int RAISES_NEG int
microprotocols_init(PyObject *dict) microprotocols_init(PyObject *module)
{ {
/* create adapters dictionary and put it in module namespace */ /* create adapters dictionary and put it in module namespace */
if ((psyco_adapters = PyDict_New()) == NULL) { if (!(psyco_adapters = PyDict_New())) {
return -1; return -1;
} }
PyDict_SetItemString(dict, "adapters", psyco_adapters); Py_INCREF(psyco_adapters);
if (0 > PyModule_AddObject(module, "adapters", psyco_adapters)) {
Py_DECREF(psyco_adapters);
return -1;
}
return 0; return 0;
} }
@ -56,7 +60,7 @@ microprotocols_init(PyObject *dict)
* *
* Return 0 on success, else -1 and set an exception. * Return 0 on success, else -1 and set an exception.
*/ */
int RAISES_NEG int
microprotocols_add(PyTypeObject *type, PyObject *proto, PyObject *cast) microprotocols_add(PyTypeObject *type, PyObject *proto, PyObject *cast)
{ {
PyObject *key = NULL; PyObject *key = NULL;

4
psycopg/microprotocols.h
View File

@ -46,8 +46,8 @@ extern HIDDEN PyObject *psyco_adapters;
/** exported functions **/ /** exported functions **/
/* used by module.c to init the microprotocols system */ /* used by module.c to init the microprotocols system */
HIDDEN int microprotocols_init(PyObject *dict); HIDDEN RAISES_NEG int microprotocols_init(PyObject *dict);
HIDDEN int microprotocols_add( HIDDEN RAISES_NEG int microprotocols_add(
PyTypeObject *type, PyObject *proto, PyObject *cast); PyTypeObject *type, PyObject *proto, PyObject *cast);
HIDDEN PyObject *microprotocols_adapt( HIDDEN PyObject *microprotocols_adapt(

153
psycopg/psycopgmodule.c
View File

@ -294,95 +294,107 @@ psyco_libcrypto_threads_init(void)
* Return 0 on success, else -1 and set an exception. * Return 0 on success, else -1 and set an exception.
*/ */
RAISES_NEG static int RAISES_NEG static int
psyco_adapters_init(PyObject *mod) adapters_init(PyObject *module)
{ {
PyObject *call = NULL; PyObject *dict = NULL, *obj = NULL;
int rv = -1; int rv = -1;
if (0 > microprotocols_init(module)) { goto exit; }
Dprintf("psycopgmodule: configuring adapters"); Dprintf("psycopgmodule: configuring adapters");
if (0 != microprotocols_add(&PyFloat_Type, NULL, (PyObject*)&pfloatType)) { if (0 > microprotocols_add(&PyFloat_Type, NULL, (PyObject*)&pfloatType)) {
goto exit; goto exit;
} }
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
if (0 != microprotocols_add(&PyInt_Type, NULL, (PyObject*)&pintType)) { if (0 > microprotocols_add(&PyInt_Type, NULL, (PyObject*)&pintType)) {
goto exit; goto exit;
} }
#endif #endif
if (0 != microprotocols_add(&PyLong_Type, NULL, (PyObject*)&pintType)) { if (0 > microprotocols_add(&PyLong_Type, NULL, (PyObject*)&pintType)) {
goto exit; goto exit;
} }
if (0 != microprotocols_add(&PyBool_Type, NULL, (PyObject*)&pbooleanType)) { if (0 > microprotocols_add(&PyBool_Type, NULL, (PyObject*)&pbooleanType)) {
goto exit; goto exit;
} }
/* strings */ /* strings */
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
if (0 != microprotocols_add(&PyString_Type, NULL, (PyObject*)&qstringType)) { if (0 > microprotocols_add(&PyString_Type, NULL, (PyObject*)&qstringType)) {
goto exit; goto exit;
} }
#endif #endif
if (0 != microprotocols_add(&PyUnicode_Type, NULL, (PyObject*)&qstringType)) { if (0 > microprotocols_add(&PyUnicode_Type, NULL, (PyObject*)&qstringType)) {
goto exit; goto exit;
} }
/* binary */ /* binary */
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
if (0 != microprotocols_add(&PyBuffer_Type, NULL, (PyObject*)&binaryType)) { if (0 > microprotocols_add(&PyBuffer_Type, NULL, (PyObject*)&binaryType)) {
goto exit; goto exit;
} }
#else #else
if (0 != microprotocols_add(&PyBytes_Type, NULL, (PyObject*)&binaryType)) { if (0 > microprotocols_add(&PyBytes_Type, NULL, (PyObject*)&binaryType)) {
goto exit; goto exit;
} }
#endif #endif
#if PY_MAJOR_VERSION >= 3 || PY_MINOR_VERSION >= 6 #if PY_MAJOR_VERSION >= 3 || PY_MINOR_VERSION >= 6
if (0 != microprotocols_add(&PyByteArray_Type, NULL, (PyObject*)&binaryType)) { if (0 > microprotocols_add(&PyByteArray_Type, NULL, (PyObject*)&binaryType)) {
goto exit; goto exit;
} }
#endif #endif
#if PY_MAJOR_VERSION >= 3 || PY_MINOR_VERSION >= 7 #if PY_MAJOR_VERSION >= 3 || PY_MINOR_VERSION >= 7
if (0 != microprotocols_add(&PyMemoryView_Type, NULL, (PyObject*)&binaryType)) { if (0 > microprotocols_add(&PyMemoryView_Type, NULL, (PyObject*)&binaryType)) {
goto exit; goto exit;
} }
#endif #endif
if (0 != microprotocols_add(&PyList_Type, NULL, (PyObject*)&listType)) { if (0 > microprotocols_add(&PyList_Type, NULL, (PyObject*)&listType)) {
goto exit; goto exit;
} }
/* the module has already been initialized, so we can obtain the callable /* the module has already been initialized, so we can obtain the callable
objects directly from its dictionary :) */ objects directly from its dictionary :) */
if (!(call = PyMapping_GetItemString(mod, "DateFromPy"))) { goto exit; } if (!(dict = PyModule_GetDict(module))) { goto exit; }
if (0 != microprotocols_add(PyDateTimeAPI->DateType, NULL, call)) { goto exit; }
Py_CLEAR(call);
if (!(call = PyMapping_GetItemString(mod, "TimeFromPy"))) { goto exit; } if (!(obj = PyMapping_GetItemString(dict, "DateFromPy"))) { goto exit; }
if (0 != microprotocols_add(PyDateTimeAPI->TimeType, NULL, call)) { goto exit; } if (0 > microprotocols_add(PyDateTimeAPI->DateType, NULL, obj)) { goto exit; }
Py_CLEAR(call); Py_CLEAR(obj);
if (!(call = PyMapping_GetItemString(mod, "TimestampFromPy"))) { goto exit; } if (!(obj = PyMapping_GetItemString(dict, "TimeFromPy"))) { goto exit; }
if (0 != microprotocols_add(PyDateTimeAPI->DateTimeType, NULL, call)) { goto exit; } if (0 > microprotocols_add(PyDateTimeAPI->TimeType, NULL, obj)) { goto exit; }
Py_CLEAR(call); Py_CLEAR(obj);
if (!(call = PyMapping_GetItemString(mod, "IntervalFromPy"))) { goto exit; } if (!(obj = PyMapping_GetItemString(dict, "TimestampFromPy"))) { goto exit; }
if (0 != microprotocols_add(PyDateTimeAPI->DeltaType, NULL, call)) { goto exit; } if (0 > microprotocols_add(PyDateTimeAPI->DateTimeType, NULL, obj)) { goto exit; }
Py_CLEAR(call); Py_CLEAR(obj);
if (!(obj = PyMapping_GetItemString(dict, "IntervalFromPy"))) { goto exit; }
if (0 > microprotocols_add(PyDateTimeAPI->DeltaType, NULL, obj)) { goto exit; }
Py_CLEAR(obj);
#ifdef HAVE_MXDATETIME #ifdef HAVE_MXDATETIME
/* as above, we use the callable objects from the psycopg module */ /* As above, we use the callable objects from the psycopg module.
if (NULL != (call = PyMapping_GetItemString(mod, "TimestampFromMx"))) { These object are not be available at runtime if mx.DateTime import
if (0 != microprotocols_add(mxDateTime.DateTime_Type, NULL, call)) { goto exit; } failed (e.g. it was available at build time but not at runtime). */
Py_CLEAR(call); if (PyMapping_HasKeyString(dict, "TimestampFromMx")) {
if (!(obj = PyMapping_GetItemString(dict, "TimestampFromMx"))) {
goto exit;
}
if (0 > microprotocols_add(mxDateTime.DateTime_Type, NULL, obj)) {
goto exit;
}
Py_CLEAR(obj);
/* if we found the above, we have this too. */ /* if we found the above, we have this too. */
if (!(call = PyMapping_GetItemString(mod, "TimeFromMx"))) { goto exit; } if (!(obj = PyMapping_GetItemString(dict, "TimeFromMx"))) {
if (0 != microprotocols_add(mxDateTime.DateTimeDelta_Type, NULL, call)) { goto exit; } goto exit;
Py_CLEAR(call);
} }
else { if (0 > microprotocols_add(mxDateTime.DateTimeDelta_Type, NULL, obj)) {
PyErr_Clear(); goto exit;
}
Py_CLEAR(obj);
} }
#endif #endif
@ -390,7 +402,7 @@ psyco_adapters_init(PyObject *mod)
rv = 0; rv = 0;
exit: exit:
Py_XDECREF(call); Py_XDECREF(obj);
return rv; return rv;
} }
@ -599,7 +611,10 @@ encodings_init(PyObject *module)
if (!(psycoEncodings = PyDict_New())) { goto exit; } if (!(psycoEncodings = PyDict_New())) { goto exit; }
Py_INCREF(psycoEncodings); Py_INCREF(psycoEncodings);
PyModule_AddObject(module, "encodings", psycoEncodings); if (0 > PyModule_AddObject(module, "encodings", psycoEncodings)) {
Py_DECREF(psycoEncodings);
goto exit;
}
for (i = 0; enctable[i].pgenc != NULL; i++) { for (i = 0; enctable[i].pgenc != NULL; i++) {
if (!(value = Text_FromUTF8(enctable[i].pyenc))) { goto exit; } if (!(value = Text_FromUTF8(enctable[i].pyenc))) { goto exit; }
@ -655,8 +670,8 @@ static struct {
}; };
static int RAISES_NEG static int
psyco_errors_init(PyObject *module) errors_init(PyObject *module)
{ {
/* the names of the exceptions here reflect the organization of the /* the names of the exceptions here reflect the organization of the
psycopg2 module and not the fact the the original error objects psycopg2 module and not the fact the the original error objects
@ -702,6 +717,7 @@ psyco_errors_init(PyObject *module)
Py_INCREF(*exctable[i].exc); Py_INCREF(*exctable[i].exc);
if (0 > PyModule_AddObject(module, name, *exctable[i].exc)) { if (0 > PyModule_AddObject(module, name, *exctable[i].exc)) {
Py_DECREF(*exctable[i].exc);
goto exit; goto exit;
} }
} }
@ -715,8 +731,7 @@ exit:
} }
RAISES_NEG RAISES_NEG static int
static int
add_module_constants(PyObject *module) add_module_constants(PyObject *module)
{ {
PyObject *tmp; PyObject *tmp;
@ -789,8 +804,7 @@ static struct {
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
RAISES_NEG RAISES_NEG static int
static int
add_module_types(PyObject *module) add_module_types(PyObject *module)
{ {
int i; int i;
@ -805,6 +819,7 @@ add_module_types(PyObject *module)
Py_INCREF(type); Py_INCREF(type);
if (0 > PyModule_AddObject(module, typetable[i].name, type)) { if (0 > PyModule_AddObject(module, typetable[i].name, type)) {
Py_DECREF(type);
return -1; return -1;
} }
} }
@ -832,7 +847,7 @@ datetime_init(void)
if (0 > psyco_replmsg_datetime_init()) { return -1; } if (0 > psyco_replmsg_datetime_init()) { return -1; }
Py_TYPE(&pydatetimeType) = &PyType_Type; Py_TYPE(&pydatetimeType) = &PyType_Type;
if (PyType_Ready(&pydatetimeType) == -1) { return -1; } if (0 > PyType_Ready(&pydatetimeType)) { return -1; }
return 0; return 0;
} }
@ -844,7 +859,7 @@ mxdatetime_init(PyObject *module)
#ifdef HAVE_MXDATETIME #ifdef HAVE_MXDATETIME
Py_TYPE(&mxdatetimeType) = &PyType_Type; Py_TYPE(&mxdatetimeType) = &PyType_Type;
if (PyType_Ready(&mxdatetimeType) == -1) { return -1; } if (0 > PyType_Ready(&mxdatetimeType)) { return -1; }
if (mxDateTime_ImportModuleAndAPI()) { if (mxDateTime_ImportModuleAndAPI()) {
Dprintf("psycopgmodule: mx.DateTime module import failed"); Dprintf("psycopgmodule: mx.DateTime module import failed");
@ -862,7 +877,7 @@ mxdatetime_init(PyObject *module)
* remove them from the module (and, as consequence, from the adapters). */ * remove them from the module (and, as consequence, from the adapters). */
if (0 != psyco_adapter_mxdatetime_init()) { if (0 != psyco_adapter_mxdatetime_init()) {
PyObject *dict; PyObject *dict;
dict = PyModule_GetDict(module); if (!(dict = PyModule_GetDict(module))) { return -1; }
if (0 > PyDict_DelItemString(dict, "DateFromMx")) { return -1; } if (0 > PyDict_DelItemString(dict, "DateFromMx")) { return -1; }
if (0 > PyDict_DelItemString(dict, "TimeFromMx")) { return -1; } if (0 > PyDict_DelItemString(dict, "TimeFromMx")) { return -1; }
if (0 > PyDict_DelItemString(dict, "TimestampFromMx")) { return -1; } if (0 > PyDict_DelItemString(dict, "TimestampFromMx")) { return -1; }
@ -957,7 +972,7 @@ static struct PyModuleDef psycopgmodule = {
PyMODINIT_FUNC PyMODINIT_FUNC
INIT_MODULE(_psycopg)(void) INIT_MODULE(_psycopg)(void)
{ {
PyObject *module = NULL, *dict; PyObject *module = NULL;
#ifdef PSYCOPG_DEBUG #ifdef PSYCOPG_DEBUG
if (getenv("PSYCOPG_DEBUG")) if (getenv("PSYCOPG_DEBUG"))
@ -966,21 +981,23 @@ INIT_MODULE(_psycopg)(void)
Dprintf("psycopgmodule: initializing psycopg %s", xstr(PSYCOPG_VERSION)); Dprintf("psycopgmodule: initializing psycopg %s", xstr(PSYCOPG_VERSION));
/* initialize the types not exposed to the module */
Py_TYPE(&typecastType) = &PyType_Type;
if (PyType_Ready(&typecastType) == -1) goto exit;
Py_TYPE(&chunkType) = &PyType_Type;
if (PyType_Ready(&chunkType) == -1) goto exit;
Py_TYPE(&errorType) = &PyType_Type;
errorType.tp_base = (PyTypeObject *)PyExc_StandardError;
if (PyType_Ready(&errorType) == -1) goto exit;
/* initialize libcrypto threading callbacks */ /* initialize libcrypto threading callbacks */
psyco_libcrypto_threads_init(); psyco_libcrypto_threads_init();
/* initialize the module and grab module's dictionary */ /* initialize types and objects not exposed to the module */
Py_TYPE(&typecastType) = &PyType_Type;
if (0 > PyType_Ready(&typecastType)) { goto exit; }
Py_TYPE(&chunkType) = &PyType_Type;
if (0 > PyType_Ready(&chunkType)) { goto exit; }
Py_TYPE(&errorType) = &PyType_Type;
errorType.tp_base = (PyTypeObject *)PyExc_StandardError;
if (0 > PyType_Ready(&errorType)) { goto exit; }
if (!(psyco_null = Bytes_FromString("NULL"))) { goto exit; }
/* initialize the module */
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
module = Py_InitModule("_psycopg", psycopgMethods); module = Py_InitModule("_psycopg", psycopgMethods);
#else #else
@ -988,28 +1005,14 @@ INIT_MODULE(_psycopg)(void)
#endif #endif
if (!module) { goto exit; } if (!module) { goto exit; }
/* other mixed initializations of module-level variables */
if (!(psyco_null = Bytes_FromString("NULL"))) { goto exit; }
if (0 > add_module_constants(module)) { goto exit; } if (0 > add_module_constants(module)) { goto exit; }
if (0 > add_module_types(module)) { goto exit; } if (0 > add_module_types(module)) { goto exit; }
if (0 > datetime_init()) { goto exit; } if (0 > datetime_init()) { goto exit; }
if (0 > mxdatetime_init(module)) { goto exit; } if (0 > mxdatetime_init(module)) { goto exit; }
/* encodings dictionary in module dictionary */
if (0 > encodings_init(module)) { goto exit; } if (0 > encodings_init(module)) { goto exit; }
if (0 > typecast_init(module)) { goto exit; }
dict = PyModule_GetDict(module); if (0 > adapters_init(module)) { goto exit; }
if (0 > errors_init(module)) { goto exit; }
/* initialize default set of typecasters */
if (0 != typecast_init(dict)) { goto exit; }
/* initialize microprotocols layer */
microprotocols_init(dict);
if (0 != psyco_adapters_init(dict)) { goto exit; }
/* create a standard set of exceptions and add them to the module's dict */
if (0 != psyco_errors_init(module)) { goto exit; }
Dprintf("psycopgmodule: module initialization complete"); Dprintf("psycopgmodule: module initialization complete");

7
psycopg/typecast.c
View File

@ -252,11 +252,14 @@ PyObject *psyco_default_binary_cast;
/* typecast_init - initialize the dictionary and create default types */ /* typecast_init - initialize the dictionary and create default types */
RAISES_NEG int RAISES_NEG int
typecast_init(PyObject *dict) typecast_init(PyObject *module)
{ {
int i; int i;
int rv = -1; int rv = -1;
typecastObject *t = NULL; typecastObject *t = NULL;
PyObject *dict = NULL;
if (!(dict = PyModule_GetDict(module))) { goto exit; }
/* create type dictionary and put it in module namespace */ /* create type dictionary and put it in module namespace */
if (!(psyco_types = PyDict_New())) { goto exit; } if (!(psyco_types = PyDict_New())) { goto exit; }
@ -285,7 +288,7 @@ typecast_init(PyObject *dict)
t = NULL; t = NULL;
} }
/* create and save a default cast object (but does not register it) */ /* create and save a default cast object (but do not register it) */
psyco_default_cast = typecast_from_c(&typecast_default, dict); psyco_default_cast = typecast_from_c(&typecast_default, dict);
/* register the date/time typecasters with their original names */ /* register the date/time typecasters with their original names */