X-Git-Url: https://git.distorted.org.uk/~mdw/pyke/blobdiff_plain/dfe0a89785e70fdb3c75196b54ae05f006a35ca3..0156e4020eb3b13a1b9bcfa9887eb922ba5d9fa2:/util.c diff --git a/util.c b/util.c index 717c3d9..8a0c06c 100644 --- a/util.c +++ b/util.c @@ -28,6 +28,10 @@ #include "catacomb-python.h" +/*----- External values ---------------------------------------------------*/ + +static PyObject *modname = 0; + /*----- Conversions -------------------------------------------------------*/ PyObject *getulong(unsigned long w) @@ -168,14 +172,17 @@ void *newtype(PyTypeObject *metaty, return (ty); } +void typeready(PyTypeObject *ty) +{ + PyType_Ready(ty); + PyDict_SetItemString(ty->tp_dict, "__module__", modname); +} + PyTypeObject *inittype(PyTypeObject *tyskel) { - static PyObject *modname = 0; PyTypeObject *ty = newtype(&PyType_Type, tyskel, 0); - if (!modname) modname = PyString_FromString("catacomb"); ty->tp_flags |= Py_TPFLAGS_HEAPTYPE; - PyType_Ready(ty); - PyDict_SetItemString(ty->tp_dict, "__module__", modname); + typeready(ty); return (ty); } @@ -637,6 +644,7 @@ PyMethodDef gmap_pymethods[] = { void util_pyinit(void) { + modname = PyString_FromString("catacomb"); INITTYPE(itemiter, root); INITTYPE(valiter, root); }