From c3a787e090dce76149ae86d70d4fecea3c285a40 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 4 Jun 2002 05:52:47 +0000 Subject: Surprising fix for SF bug 563060: module can be used as base class. Change the module constructor (module_init) to have the signature __init__(name:str, doc=None); this prevents the call from type_new() to succeed. While we're at it, prevent repeated calling of module_init for the same module from leaking the dict, changing the semantics so that __dict__ is only initialized if NULL. Also adding a unittest, test_module.py. This is an incompatibility with 2.2, if anybody was instantiating the module class before, their argument list was probably empty; so this can't be backported to 2.2.x. --- Objects/moduleobject.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'Objects/moduleobject.c') diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 807adfa3d2..9cd7f31d38 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -147,10 +147,23 @@ _PyModule_Clear(PyObject *m) /* Methods */ static int -module_init(PyModuleObject *m, PyObject *args, PyObject *kw) +module_init(PyModuleObject *m, PyObject *args, PyObject *kwds) { - m->md_dict = PyDict_New(); - if (m->md_dict == NULL) + static char *kwlist[] = {"name", "doc", NULL}; + PyObject *dict, *name = Py_None, *doc = Py_None; + if (!PyArg_ParseTupleAndKeywords(args, kwds, "S|O", kwlist, + &name, &doc)) + return -1; + dict = m->md_dict; + if (dict == NULL) { + dict = PyDict_New(); + if (dict == NULL) + return -1; + m->md_dict = dict; + } + if (PyDict_SetItemString(dict, "__name__", name) < 0) + return -1; + if (PyDict_SetItemString(dict, "__doc__", doc) < 0) return -1; return 0; } -- cgit v1.2.1