[Python-checkins] python/dist/src/Objects moduleobject.c,2.42,2.43

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv13899

Modified Files:
	moduleobject.c 
Log Message:
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.


Index: moduleobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/moduleobject.c,v
retrieving revision 2.42
retrieving revision 2.43
diff -C2 -d -r2.42 -r2.43
*** moduleobject.c	12 Apr 2002 02:44:22 -0000	2.42
--- moduleobject.c	4 Jun 2002 05:52:06 -0000	2.43
***************
*** 148,155 ****
  
  static int
! module_init(PyModuleObject *m, PyObject *args, PyObject *kw)
  {
! 	m->md_dict = PyDict_New();
! 	if (m->md_dict == NULL)
  		return -1;
  	return 0;
--- 148,168 ----
  
  static int
! module_init(PyModuleObject *m, PyObject *args, PyObject *kwds)
  {
! 	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;