Mercurial > cpython-lru_cache-weakref
diff Objects/moduleobject.c @ 23652:b40165a4efe9 legacy-trunk
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.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Tue, 04 Jun 2002 05:52:47 +0000 |
| parents | 29e6cb832497 |
| children | b86eaeb0d7dd |
line wrap: on
line diff
--- a/Objects/moduleobject.c Tue Jun 04 02:17:04 2002 +0000 +++ b/Objects/moduleobject.c Tue Jun 04 05:52:47 2002 +0000 @@ -147,10 +147,23 @@ /* 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; }