[Zodb-checkins] CVS: ZODB3 - typeobject.patch:1.2
Guido van Rossum
guido@python.org
Tue, 24 Sep 2002 23:41:21 -0400
Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv3582
Added Files:
typeobject.patch
Log Message:
Add typeobject.patch from 3.1 release branch.
=== ZODB3/typeobject.patch 1.1 => 1.2 ===
--- /dev/null Tue Sep 24 23:41:21 2002
+++ ZODB3/typeobject.patch Tue Sep 24 23:41:21 2002
@@ -0,0 +1,25 @@
+===================================================================
+RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
+retrieving revision 2.126.4.19
+retrieving revision 2.126.4.20
+diff -c -r2.126.4.19 -r2.126.4.20
+*** Objects/typeobject.c 2002/07/11 07:06:44 2.126.4.19
+--- Objects/typeobject.c 2002/07/16 19:42:21 2.126.4.20
+***************
+*** 190,196 ****
+ (PyDict_Check(kwds) && PyDict_Size(kwds) == 0)))
+ return obj;
+ type = obj->ob_type;
+! if (type->tp_init != NULL &&
+ type->tp_init(obj, args, kwds) < 0) {
+ Py_DECREF(obj);
+ obj = NULL;
+--- 190,197 ----
+ (PyDict_Check(kwds) && PyDict_Size(kwds) == 0)))
+ return obj;
+ type = obj->ob_type;
+! if (PyType_HasFeature(type, Py_TPFLAGS_HAVE_CLASS) &&
+! type->tp_init != NULL &&
+ type->tp_init(obj, args, kwds) < 0) {
+ Py_DECREF(obj);
+ obj = NULL;