[Python-checkins] CVS: python/dist/src/Objects typeobject.c,2.20,2.21

[Guido van Rossum]

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

Modified Files:
	typeobject.c 
Log Message:
A totally new way to do the __new__ wrapper.  This should address the
problem brought up in SF bug #444229.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -d -r2.20 -r2.21
*** typeobject.c	2001/08/02 15:31:58	2.20
--- typeobject.c	2001/08/06 16:50:37	2.21
***************
*** 940,968 ****
  
  static int
- add_staticmethodwrappers(PyTypeObject *type, struct wrapperbase *base,
- 			void *wrapped)
- {
- 	PyObject *dict = type->tp_defined;
- 	PyObject *sm;
- 
- 	for (; base->name != NULL; base++) {
- 		PyObject *descr;
- 		if (PyDict_GetItemString(dict, base->name))
- 			continue;
- 		descr = PyDescr_NewWrapper(type->ob_type, base, wrapped);
- 		if (descr == NULL)
- 			return -1;
- 		sm = PyStaticMethod_New(descr);
- 		Py_DECREF(descr);
- 		if (sm == NULL)
- 			return -1;
- 		if (PyDict_SetItemString(dict, base->name, sm) < 0)
- 			return -1;
- 		Py_DECREF(sm);
- 	}
- 	return 0;
- }
- 
- static int
  add_members(PyTypeObject *type, struct memberlist *memb)
  {
--- 940,943 ----
***************
*** 1198,1202 ****
  
  	/* Initialize the base class */
! 	if (base) {
  		if (PyType_InitDict(base) < 0)
  			return -1;
--- 1173,1177 ----
  
  	/* Initialize the base class */
! 	if (base && base->tp_dict == NULL) {
  		if (PyType_InitDict(base) < 0)
  			return -1;
***************
*** 1854,1870 ****
  
  static PyObject *
! wrap_new(PyObject *type, PyObject *args, void *wrapped)
  {
! 	newfunc new = (newfunc)wrapped;
! 	return new((PyTypeObject *)type, args, NULL);
  }
  
! static struct wrapperbase tab_new[] = {
! 	{"__new__", (wrapperfunc)wrap_new,
! 	 "T.__new__() -> an object with type T"},
  	{0}
  };
  
  static int
  add_operators(PyTypeObject *type)
  {
--- 1829,1882 ----
  
  static PyObject *
! tp_new_wrapper(PyObject *self, PyObject *args, PyObject *kwds)
  {
! 	PyTypeObject *type, *subtype;
! 	PyObject *arg0, *res;
! 
! 	if (self == NULL || !PyType_Check(self))
! 		Py_FatalError("__new__() called with non-type 'self'");
! 	type = (PyTypeObject *)self;
! 	if (!PyTuple_Check(args) || PyTuple_GET_SIZE(args) < 1) {
! 		PyErr_SetString(PyExc_TypeError,
! 				"T.__new__(): not enough arguments");
! 		return NULL;
! 	}
! 	arg0 = PyTuple_GET_ITEM(args, 0);
! 	if (!PyType_Check(arg0)) {
! 		PyErr_SetString(PyExc_TypeError,
! 				"T.__new__(S): S is not a type object");
! 		return NULL;
! 	}
! 	subtype = (PyTypeObject *)arg0;
! 	if (!PyType_IsSubtype(subtype, type)) {
! 		PyErr_SetString(PyExc_TypeError,
! 				"T.__new__(S): S is not a subtype of T");
! 		return NULL;
! 	}
! 	args = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
! 	if (args == NULL)
! 		return NULL;
! 	res = type->tp_new(subtype, args, kwds);
! 	Py_DECREF(args);
! 	return res;
  }
  
! static struct PyMethodDef tp_new_methoddef[] = {
! 	{"__new__", (PyCFunction)tp_new_wrapper, METH_KEYWORDS,
! 	 "T.__new__(S, ...) -> a new object with type S, a subtype of T"},
  	{0}
  };
  
  static int
+ add_tp_new_wrapper(PyTypeObject *type)
+ {
+ 	PyObject *func = PyCFunction_New(tp_new_methoddef, (PyObject *)type);
+ 
+ 	if (func == NULL)
+ 		return -1;
+ 	return PyDict_SetItemString(type->tp_defined, "__new__", func);
+ }
+ 
+ static int
  add_operators(PyTypeObject *type)
  {
***************
*** 1956,1961 ****
  
  	if (type->tp_new != NULL)
! 		add_staticmethodwrappers(type, tab_new,
! 					 (void *)(type->tp_new));
  
  	return 0;
--- 1968,1972 ----
  
  	if (type->tp_new != NULL)
! 		add_tp_new_wrapper(type);
  
  	return 0;