cpython-lru_cache-weakref: Objects/typeobject.c annotate

annotate Objects/typeobject.c @ 33091:48100a01ac7c 2.3

Ignore the locale's encoding if it is an empty string.

author	Martin v. Löwis <martin@v.loewis.de>
date	Thu, 12 Aug 2004 13:14:20 +0000
parents	d99b5bed0078
children	a6c80170fc53

rev	line source
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Type object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	3 #include "Python.h"
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4 #include "structmember.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	6 #include <ctype.h>
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	7
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	8 static PyMemberDef type_members[] = {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	9 {"__basicsize__", T_INT, offsetof(PyTypeObject,tp_basicsize),READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	10 {"__itemsize__", T_INT, offsetof(PyTypeObject, tp_itemsize), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	11 {"__flags__", T_LONG, offsetof(PyTypeObject, tp_flags), READONLY},
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	12 {"__weakrefoffset__", T_LONG,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	13 offsetof(PyTypeObject, tp_weaklistoffset), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	14 {"__base__", T_OBJECT, offsetof(PyTypeObject, tp_base), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	15 {"__dictoffset__", T_LONG,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	16 offsetof(PyTypeObject, tp_dictoffset), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	17 {"__mro__", T_OBJECT, offsetof(PyTypeObject, tp_mro), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	18 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	19 };
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	20
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	21 static PyObject *
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	22 type_name(PyTypeObject type, void context)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	23 {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	24 char *s;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	25
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	26 if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	27 PyHeapTypeObject* et = (PyHeapTypeObject*)type;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	28
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	29 Py_INCREF(et->name);
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	30 return et->name;
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	31 }
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	32 else {
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	33 s = strrchr(type->tp_name, '.');
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	34 if (s == NULL)
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	35 s = type->tp_name;
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	36 else
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	37 s++;
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	38 return PyString_FromString(s);
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	39 }
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	40 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	41
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	42 static int
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	43 type_set_name(PyTypeObject type, PyObject value, void *context)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	44 {
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	45 PyHeapTypeObject* et;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	46
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	47 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	48 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	49 "can't set %s.__name__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	50 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	51 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	52 if (!value) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	53 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	54 "can't delete %s.__name__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	55 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	56 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	57 if (!PyString_Check(value)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	58 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	59 "can only assign string to %s.__name__, not '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	60 type->tp_name, value->ob_type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	61 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	62 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	63 if (strlen(PyString_AS_STRING(value))
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	64 != (size_t)PyString_GET_SIZE(value)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	65 PyErr_Format(PyExc_ValueError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	66 "__name__ must not contain null bytes");
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	67 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	68 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	69
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	70 et = (PyHeapTypeObject*)type;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	71
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	72 Py_INCREF(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	73
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	74 Py_DECREF(et->name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	75 et->name = value;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	76
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	77 type->tp_name = PyString_AS_STRING(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	78
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	79 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	80 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	81
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	82 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	83 type_module(PyTypeObject type, void context)
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	84 {
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	85 PyObject *mod;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	86 char *s;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	87
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	88 if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	89 mod = PyDict_GetItemString(type->tp_dict, "__module__");
32324 b054cff7bb86 Backport: Anthony Baxter <anthonybaxter@gmail.com> parents: 32058 diff changeset	90 if (!mod) {
b054cff7bb86 Backport: Anthony Baxter <anthonybaxter@gmail.com> parents: 32058 diff changeset	91 PyErr_Format(PyExc_AttributeError, "__module__");
b054cff7bb86 Backport: Anthony Baxter <anthonybaxter@gmail.com> parents: 32058 diff changeset	92 return 0;
b054cff7bb86 Backport: Anthony Baxter <anthonybaxter@gmail.com> parents: 32058 diff changeset	93 }
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	94 Py_XINCREF(mod);
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	95 return mod;
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	96 }
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	97 else {
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	98 s = strrchr(type->tp_name, '.');
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	99 if (s != NULL)
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	100 return PyString_FromStringAndSize(
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	101 type->tp_name, (int)(s - type->tp_name));
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	102 return PyString_FromString("__builtin__");
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	103 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	104 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	105
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	106 static int
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	107 type_set_module(PyTypeObject type, PyObject value, void *context)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	108 {
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	109 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	110 PyErr_Format(PyExc_TypeError,
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	111 "can't set %s.__module__", type->tp_name);
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	112 return -1;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	113 }
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	114 if (!value) {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	115 PyErr_Format(PyExc_TypeError,
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	116 "can't delete %s.__module__", type->tp_name);
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	117 return -1;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	118 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	119
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	120 return PyDict_SetItemString(type->tp_dict, "__module__", value);
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	121 }
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	122
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	123 static PyObject *
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	124 type_get_bases(PyTypeObject type, void context)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	125 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	126 Py_INCREF(type->tp_bases);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	127 return type->tp_bases;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	128 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	129
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	130 static PyTypeObject best_base(PyObject );
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	131 static int mro_internal(PyTypeObject *);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	132 static int compatible_for_assignment(PyTypeObject , PyTypeObject , char *);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	133 static int add_subclass(PyTypeObject, PyTypeObject);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	134 static void remove_subclass(PyTypeObject , PyTypeObject );
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	135 static void update_all_slots(PyTypeObject *);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	136
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	137 typedef int (update_callback)(PyTypeObject , void *);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	138 static int update_subclasses(PyTypeObject type, PyObject name,
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	139 update_callback callback, void *data);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	140 static int recurse_down_subclasses(PyTypeObject type, PyObject name,
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	141 update_callback callback, void *data);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	142
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	143 static int
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	144 mro_subclasses(PyTypeObject type, PyObject temp)
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	145 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	146 PyTypeObject *subclass;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	147 PyObject ref, subclasses, *old_mro;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	148 int i, n;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	149
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	150 subclasses = type->tp_subclasses;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	151 if (subclasses == NULL)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	152 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	153 assert(PyList_Check(subclasses));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	154 n = PyList_GET_SIZE(subclasses);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	155 for (i = 0; i < n; i++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	156 ref = PyList_GET_ITEM(subclasses, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	157 assert(PyWeakref_CheckRef(ref));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	158 subclass = (PyTypeObject *)PyWeakref_GET_OBJECT(ref);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	159 assert(subclass != NULL);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	160 if ((PyObject *)subclass == Py_None)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	161 continue;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	162 assert(PyType_Check(subclass));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	163 old_mro = subclass->tp_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	164 if (mro_internal(subclass) < 0) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	165 subclass->tp_mro = old_mro;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	166 return -1;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	167 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	168 else {
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	169 PyObject* tuple;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	170 tuple = Py_BuildValue("OO", subclass, old_mro);
28625 07d8e0eab3af Fix three (!) object leaks in the code for assignment to __bases__. Guido van Rossum <guido@python.org> parents: 28621 diff changeset	171 Py_DECREF(old_mro);
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	172 if (!tuple)
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	173 return -1;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	174 if (PyList_Append(temp, tuple) < 0)
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	175 return -1;
28625 07d8e0eab3af Fix three (!) object leaks in the code for assignment to __bases__. Guido van Rossum <guido@python.org> parents: 28621 diff changeset	176 Py_DECREF(tuple);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	177 }
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	178 if (mro_subclasses(subclass, temp) < 0)
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	179 return -1;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	180 }
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	181 return 0;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	182 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	183
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	184 static int
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	185 type_set_bases(PyTypeObject type, PyObject value, void *context)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	186 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	187 int i, r = 0;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	188 PyObject ob, temp;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	189 PyTypeObject new_base, old_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	190 PyObject old_bases, old_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	191
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	192 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	193 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	194 "can't set %s.__bases__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	195 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	196 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	197 if (!value) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	198 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	199 "can't delete %s.__bases__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	200 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	201 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	202 if (!PyTuple_Check(value)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	203 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	204 "can only assign tuple to %s.__bases__, not %s",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	205 type->tp_name, value->ob_type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	206 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	207 }
26645 d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	208 if (PyTuple_GET_SIZE(value) == 0) {
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	209 PyErr_Format(PyExc_TypeError,
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	210 "can only assign non-empty tuple to %s.__bases__, not ()",
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	211 type->tp_name);
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	212 return -1;
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	213 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	214 for (i = 0; i < PyTuple_GET_SIZE(value); i++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	215 ob = PyTuple_GET_ITEM(value, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	216 if (!PyClass_Check(ob) && !PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	217 PyErr_Format(
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	218 PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	219 "%s.__bases__ must be tuple of old- or new-style classes, not '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	220 type->tp_name, ob->ob_type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	221 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	222 }
26440 aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	223 if (PyType_Check(ob)) {
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	224 if (PyType_IsSubtype((PyTypeObject*)ob, type)) {
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	225 PyErr_SetString(PyExc_TypeError,
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	226 "a __bases__ item causes an inheritance cycle");
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	227 return -1;
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	228 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	229 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	230 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	231
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	232 new_base = best_base(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	233
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	234 if (!new_base) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	235 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	236 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	237
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	238 if (!compatible_for_assignment(type->tp_base, new_base, "__bases__"))
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	239 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	240
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	241 Py_INCREF(new_base);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	242 Py_INCREF(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	243
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	244 old_bases = type->tp_bases;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	245 old_base = type->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	246 old_mro = type->tp_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	247
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	248 type->tp_bases = value;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	249 type->tp_base = new_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	250
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	251 if (mro_internal(type) < 0) {
26446 7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	252 goto bail;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	253 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	254
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	255 temp = PyList_New(0);
26446 7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	256 if (!temp)
7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	257 goto bail;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	258
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	259 r = mro_subclasses(type, temp);
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	260
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	261 if (r < 0) {
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	262 for (i = 0; i < PyList_Size(temp); i++) {
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	263 PyTypeObject* cls;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	264 PyObject* mro;
28625 07d8e0eab3af Fix three (!) object leaks in the code for assignment to __bases__. Guido van Rossum <guido@python.org> parents: 28621 diff changeset	265 PyArg_ParseTuple(PyList_GET_ITEM(temp, i),
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	266 "OO", &cls, &mro);
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	267 Py_DECREF(cls->tp_mro);
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	268 cls->tp_mro = mro;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	269 Py_INCREF(cls->tp_mro);
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	270 }
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	271 Py_DECREF(temp);
26446 7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	272 goto bail;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	273 }
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	274
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	275 Py_DECREF(temp);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	276
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	277 /* any base that was in __bases__ but now isn't, we
26660 f838bc9056cc Punctuation fix. Raymond Hettinger <python@rcn.com> parents: 26645 diff changeset	278 need to remove \|type\| from its tp_subclasses.
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	279 conversely, any class now in __bases__ that wasn't
26660 f838bc9056cc Punctuation fix. Raymond Hettinger <python@rcn.com> parents: 26645 diff changeset	280 needs to have \|type\| added to its subclasses. */
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	281
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	282 /* for now, sod that: just remove from all old_bases,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	283 add to all new_bases */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	284
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	285 for (i = PyTuple_GET_SIZE(old_bases) - 1; i >= 0; i--) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	286 ob = PyTuple_GET_ITEM(old_bases, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	287 if (PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	288 remove_subclass(
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	289 (PyTypeObject*)ob, type);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	290 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	291 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	292
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	293 for (i = PyTuple_GET_SIZE(value) - 1; i >= 0; i--) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	294 ob = PyTuple_GET_ITEM(value, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	295 if (PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	296 if (add_subclass((PyTypeObject*)ob, type) < 0)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	297 r = -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	298 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	299 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	300
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	301 update_all_slots(type);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	302
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	303 Py_DECREF(old_bases);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	304 Py_DECREF(old_base);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	305 Py_DECREF(old_mro);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	306
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	307 return r;
26446 7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	308
7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	309 bail:
30085 dbde3dd31068 As penance for forgetting to flag my last checkins as bugfix candidates, Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	310 Py_DECREF(type->tp_bases);
dbde3dd31068 As penance for forgetting to flag my last checkins as bugfix candidates, Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	311 Py_DECREF(type->tp_base);
dbde3dd31068 As penance for forgetting to flag my last checkins as bugfix candidates, Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	312 if (type->tp_mro != old_mro) {
dbde3dd31068 As penance for forgetting to flag my last checkins as bugfix candidates, Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	313 Py_DECREF(type->tp_mro);
dbde3dd31068 As penance for forgetting to flag my last checkins as bugfix candidates, Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	314 }
dbde3dd31068 As penance for forgetting to flag my last checkins as bugfix candidates, Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	315
26446 7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	316 type->tp_bases = old_bases;
7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	317 type->tp_base = old_base;
7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	318 type->tp_mro = old_mro;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	319
26446 7777dceb66ee I don't know why staring at the email to python-checkins made me Michael W. Hudson <mwh@python.net> parents: 26445 diff changeset	320 return -1;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	321 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	322
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	323 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	324 type_dict(PyTypeObject type, void context)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	325 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	326 if (type->tp_dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	327 Py_INCREF(Py_None);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	328 return Py_None;
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	329 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	330 return PyDictProxy_New(type->tp_dict);
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	331 }
c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	332
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	333 static PyObject *
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	334 type_get_doc(PyTypeObject type, void context)
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	335 {
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	336 PyObject *result;
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	337 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE) && type->tp_doc != NULL)
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	338 return PyString_FromString(type->tp_doc);
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	339 result = PyDict_GetItemString(type->tp_dict, "__doc__");
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	340 if (result == NULL) {
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	341 result = Py_None;
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	342 Py_INCREF(result);
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	343 }
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	344 else if (result->ob_type->tp_descr_get) {
23127 70650ae1a2cf type_get_doc(): Squash compiler wng about incompatible ptr types. Tim Peters <tim.peters@gmail.com> parents: 23118 diff changeset	345 result = result->ob_type->tp_descr_get(result, NULL,
70650ae1a2cf type_get_doc(): Squash compiler wng about incompatible ptr types. Tim Peters <tim.peters@gmail.com> parents: 23118 diff changeset	346 (PyObject *)type);
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	347 }
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	348 else {
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	349 Py_INCREF(result);
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	350 }
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	351 return result;
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	352 }
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	353
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	354 static PyGetSetDef type_getsets[] = {
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	355 {"__name__", (getter)type_name, (setter)type_set_name, NULL},
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	356 {"__bases__", (getter)type_get_bases, (setter)type_set_bases, NULL},
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	357 {"__module__", (getter)type_module, (setter)type_set_module, NULL},
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	358 {"__dict__", (getter)type_dict, NULL, NULL},
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	359 {"__doc__", (getter)type_get_doc, NULL, NULL},
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	360 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	361 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	362
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	363 static int
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	364 type_compare(PyObject v, PyObject w)
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	365 {
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	366 /* This is called with type objects only. So we
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	367 can just compare the addresses. */
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	368 Py_uintptr_t vv = (Py_uintptr_t)v;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	369 Py_uintptr_t ww = (Py_uintptr_t)w;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	370 return (vv < ww) ? -1 : (vv > ww) ? 1 : 0;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	371 }
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	372
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	373 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	374 type_repr(PyTypeObject *type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	375 {
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	376 PyObject mod, name, *rtn;
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	377 char *kind;
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	378
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	379 mod = type_module(type, NULL);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	380 if (mod == NULL)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	381 PyErr_Clear();
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	382 else if (!PyString_Check(mod)) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	383 Py_DECREF(mod);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	384 mod = NULL;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	385 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	386 name = type_name(type, NULL);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	387 if (name == NULL)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	388 return NULL;
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	389
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	390 if (type->tp_flags & Py_TPFLAGS_HEAPTYPE)
d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	391 kind = "class";
d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	392 else
d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	393 kind = "type";
d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	394
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	395 if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__")) {
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	396 rtn = PyString_FromFormat("<%s '%s.%s'>",
d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	397 kind,
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	398 PyString_AS_STRING(mod),
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	399 PyString_AS_STRING(name));
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	400 }
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	401 else
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	402 rtn = PyString_FromFormat("<%s '%s'>", kind, type->tp_name);
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	403
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	404 Py_XDECREF(mod);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	405 Py_DECREF(name);
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	406 return rtn;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	407 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	408
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	409 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	410 type_call(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	411 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	412 PyObject *obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	413
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	414 if (type->tp_new == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	415 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	416 "cannot create '%.100s' instances",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	417 type->tp_name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	418 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	419 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	420
19898 fc40d0b54043 type_call(): Change in policy. The keyword args (if any) are now passed Tim Peters <tim.peters@gmail.com> parents: 19808 diff changeset	421 obj = type->tp_new(type, args, kwds);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	422 if (obj != NULL) {
20516 d21160a92179 Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink) Guido van Rossum <guido@python.org> parents: 20499 diff changeset	423 /* Ugly exception: when the call was type(something),
d21160a92179 Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink) Guido van Rossum <guido@python.org> parents: 20499 diff changeset	424 don't call tp_init on the result. */
d21160a92179 Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink) Guido van Rossum <guido@python.org> parents: 20499 diff changeset	425 if (type == &PyType_Type &&
d21160a92179 Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink) Guido van Rossum <guido@python.org> parents: 20499 diff changeset	426 PyTuple_Check(args) && PyTuple_GET_SIZE(args) == 1 &&
d21160a92179 Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink) Guido van Rossum <guido@python.org> parents: 20499 diff changeset	427 (kwds == NULL \|\|
d21160a92179 Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink) Guido van Rossum <guido@python.org> parents: 20499 diff changeset	428 (PyDict_Check(kwds) && PyDict_Size(kwds) == 0)))
d21160a92179 Fix SF bug #472234: type(obj) calls type->tp_init (Roeland Rengelink) Guido van Rossum <guido@python.org> parents: 20499 diff changeset	429 return obj;
22859 bbf05af3c191 - Changed new-style class instantiation so that when C's __new__ Guido van Rossum <guido@python.org> parents: 22854 diff changeset	430 /* If the returned object is not an instance of type,
bbf05af3c191 - Changed new-style class instantiation so that when C's __new__ Guido van Rossum <guido@python.org> parents: 22854 diff changeset	431 it won't be initialized. */
bbf05af3c191 - Changed new-style class instantiation so that when C's __new__ Guido van Rossum <guido@python.org> parents: 22854 diff changeset	432 if (!PyType_IsSubtype(obj->ob_type, type))
bbf05af3c191 - Changed new-style class instantiation so that when C's __new__ Guido van Rossum <guido@python.org> parents: 22854 diff changeset	433 return obj;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	434 type = obj->ob_type;
24250 804ea51cfce6 The object returned by tp_new() may not have a tp_init. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24245 diff changeset	435 if (PyType_HasFeature(type, Py_TPFLAGS_HAVE_CLASS) &&
804ea51cfce6 The object returned by tp_new() may not have a tp_init. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24245 diff changeset	436 type->tp_init != NULL &&
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	437 type->tp_init(obj, args, kwds) < 0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	438 Py_DECREF(obj);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	439 obj = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	440 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	441 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	442 return obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	443 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	444
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	445 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	446 PyType_GenericAlloc(PyTypeObject *type, int nitems)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	447 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	448 PyObject *obj;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	449 const size_t size = _PyObject_VAR_SIZE(type, nitems+1);
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	450 /* note that we need to add one, for the sentinel */
20293 b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	451
b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	452 if (PyType_IS_GC(type))
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	453 obj = _PyObject_GC_Malloc(size);
20293 b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	454 else
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	455 obj = PyObject_MALLOC(size);
20293 b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	456
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	457 if (obj == NULL)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	458 return PyErr_NoMemory();
20293 b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	459
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	460 memset(obj, '\0', size);
20293 b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	461
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	462 if (type->tp_flags & Py_TPFLAGS_HEAPTYPE)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	463 Py_INCREF(type);
20293 b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	464
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	465 if (type->tp_itemsize == 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	466 PyObject_INIT(obj, type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	467 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	468 (void) PyObject_INIT_VAR((PyVarObject *)obj, type, nitems);
20293 b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	469
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	470 if (PyType_IS_GC(type))
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	471 _PyObject_GC_TRACK(obj);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	472 return obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	473 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	474
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	475 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	476 PyType_GenericNew(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	477 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	478 return type->tp_alloc(type, 0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	479 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	480
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	481 /* Helpers for subtyping */
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	482
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	483 static int
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	484 traverse_slots(PyTypeObject type, PyObject self, visitproc visit, void *arg)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	485 {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	486 int i, n;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	487 PyMemberDef *mp;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	488
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	489 n = type->ob_size;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	490 mp = PyHeapType_GET_MEMBERS((PyHeapTypeObject *)type);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	491 for (i = 0; i < n; i++, mp++) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	492 if (mp->type == T_OBJECT_EX) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	493 char addr = (char )self + mp->offset;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	494 PyObject obj = (PyObject **)addr;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	495 if (obj != NULL) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	496 int err = visit(obj, arg);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	497 if (err)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	498 return err;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	499 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	500 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	501 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	502 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	503 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	504
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	505 static int
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	506 subtype_traverse(PyObject self, visitproc visit, void arg)
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	507 {
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	508 PyTypeObject type, base;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	509 traverseproc basetraverse;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	510
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	511 /* Find the nearest base with a different tp_traverse,
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	512 and traverse slots while we're at it */
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	513 type = self->ob_type;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	514 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	515 while ((basetraverse = base->tp_traverse) == subtype_traverse) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	516 if (base->ob_size) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	517 int err = traverse_slots(base, self, visit, arg);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	518 if (err)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	519 return err;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	520 }
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	521 base = base->tp_base;
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	522 assert(base);
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	523 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	524
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	525 if (type->tp_dictoffset != base->tp_dictoffset) {
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	526 PyObject **dictptr = _PyObject_GetDictPtr(self);
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	527 if (dictptr && *dictptr) {
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	528 int err = visit(*dictptr, arg);
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	529 if (err)
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	530 return err;
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	531 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	532 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	533
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	534 if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	535 /* For a heaptype, the instances count as references
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	536 to the type. Traverse the type so the collector
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	537 can find cycles involving this link. */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	538 int err = visit((PyObject *)type, arg);
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	539 if (err)
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	540 return err;
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	541 }
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	542
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	543 if (basetraverse)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	544 return basetraverse(self, visit, arg);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	545 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	546 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	547
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	548 static void
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	549 clear_slots(PyTypeObject type, PyObject self)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	550 {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	551 int i, n;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	552 PyMemberDef *mp;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	553
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	554 n = type->ob_size;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	555 mp = PyHeapType_GET_MEMBERS((PyHeapTypeObject *)type);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	556 for (i = 0; i < n; i++, mp++) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	557 if (mp->type == T_OBJECT_EX && !(mp->flags & READONLY)) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	558 char addr = (char )self + mp->offset;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	559 PyObject obj = (PyObject **)addr;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	560 if (obj != NULL) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	561 Py_DECREF(obj);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	562 (PyObject *)addr = NULL;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	563 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	564 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	565 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	566 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	567
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	568 static int
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	569 subtype_clear(PyObject *self)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	570 {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	571 PyTypeObject type, base;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	572 inquiry baseclear;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	573
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	574 /* Find the nearest base with a different tp_clear
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	575 and clear slots while we're at it */
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	576 type = self->ob_type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	577 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	578 while ((baseclear = base->tp_clear) == subtype_clear) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	579 if (base->ob_size)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	580 clear_slots(base, self);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	581 base = base->tp_base;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	582 assert(base);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	583 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	584
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	585 /* There's no need to clear the instance dict (if any);
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	586 the collector will call its tp_clear handler. */
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	587
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	588 if (baseclear)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	589 return baseclear(self);
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	590 return 0;
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	591 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	592
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	593 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	594 subtype_dealloc(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	595 {
21246 cb921d483e00 The previous checkin to clear __slots__ variables did a little bit of Guido van Rossum <guido@python.org> parents: 21242 diff changeset	596 PyTypeObject type, base;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	597 destructor basedealloc;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	598
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	599 /* Extract the type; we expect it to be a heap type */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	600 type = self->ob_type;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	601 assert(type->tp_flags & Py_TPFLAGS_HEAPTYPE);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	602
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	603 /* Test whether the type has GC exactly once */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	604
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	605 if (!PyType_IS_GC(type)) {
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	606 /* It's really rare to find a dynamic type that doesn't have
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	607 GC; it can only happen when deriving from 'object' and not
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	608 adding any slots or instance variables. This allows
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	609 certain simplifications: there's no need to call
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	610 clear_slots(), or DECREF the dict, or clear weakrefs. */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	611
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	612 /* Maybe call finalizer; exit early if resurrected */
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	613 if (type->tp_del) {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	614 type->tp_del(self);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	615 if (self->ob_refcnt > 0)
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	616 return;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	617 }
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	618
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	619 /* Find the nearest base with a different tp_dealloc */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	620 base = type;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	621 while ((basedealloc = base->tp_dealloc) == subtype_dealloc) {
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	622 assert(base->ob_size == 0);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	623 base = base->tp_base;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	624 assert(base);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	625 }
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	626
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	627 /* Call the base tp_dealloc() */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	628 assert(basedealloc);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	629 basedealloc(self);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	630
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	631 /* Can't reference self beyond this point */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	632 Py_DECREF(type);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	633
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	634 /* Done */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	635 return;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	636 }
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	637
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	638 /* We get here only if the type has GC */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	639
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	640 /* UnTrack and re-Track around the trashcan macro, alas */
27717 41313d20d1dd Comment typo fix Andrew M. Kuchling <amk@amk.ca> parents: 27707 diff changeset	641 /* See explanation at end of function for full disclosure */
24653 1ab27c1770df Fix a subtle bug in the trashcan code I added yesterday to Guido van Rossum <guido@python.org> parents: 24614 diff changeset	642 PyObject_GC_UnTrack(self);
27707 e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	643 ++_PyTrash_delete_nesting;
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	644 Py_TRASHCAN_SAFE_BEGIN(self);
27707 e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	645 --_PyTrash_delete_nesting;
30916 81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	646 /* DO NOT restore GC tracking at this point. weakref callbacks
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	647 * (if any, and whether directly here or indirectly in something we
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	648 * call) may trigger GC, and if self is tracked at that point, it
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	649 * will look like trash to GC and GC will try to delete self again.
30908 cd7624b025a0 Backport of fix for SF bug 840829, memory corruption in some cases of Tim Peters <tim.peters@gmail.com> parents: 30723 diff changeset	650 */
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	651
29442 6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	652 /* Find the nearest base with a different tp_dealloc */
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	653 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	654 while ((basedealloc = base->tp_dealloc) == subtype_dealloc) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	655 base = base->tp_base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	656 assert(base);
21246 cb921d483e00 The previous checkin to clear __slots__ variables did a little bit of Guido van Rossum <guido@python.org> parents: 21242 diff changeset	657 }
cb921d483e00 The previous checkin to clear __slots__ variables did a little bit of Guido van Rossum <guido@python.org> parents: 21242 diff changeset	658
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	659 /* If we added a weaklist, we clear it. Do this before calling
29442 6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	660 the finalizer (__del__), clearing slots, or clearing the instance
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	661 dict. */
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	662
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	663 if (type->tp_weaklistoffset && !base->tp_weaklistoffset)
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	664 PyObject_ClearWeakRefs(self);
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	665
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	666 /* Maybe call finalizer; exit early if resurrected */
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	667 if (type->tp_del) {
30916 81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	668 _PyObject_GC_TRACK(self);
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	669 type->tp_del(self);
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	670 if (self->ob_refcnt > 0)
30916 81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	671 goto endlabel; /* resurrected */
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	672 else
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	673 _PyObject_GC_UNTRACK(self);
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	674 }
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	675
29442 6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	676 /* Clear slots up to the nearest base with a different tp_dealloc */
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	677 base = type;
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	678 while ((basedealloc = base->tp_dealloc) == subtype_dealloc) {
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	679 if (base->ob_size)
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	680 clear_slots(base, self);
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	681 base = base->tp_base;
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	682 assert(base);
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	683 }
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	684
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	685 /* If we added a dict, DECREF it */
19616 337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	686 if (type->tp_dictoffset && !base->tp_dictoffset) {
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	687 PyObject **dictptr = _PyObject_GetDictPtr(self);
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	688 if (dictptr != NULL) {
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	689 PyObject dict = dictptr;
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	690 if (dict != NULL) {
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	691 Py_DECREF(dict);
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	692 *dictptr = NULL;
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	693 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	694 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	695 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	696
30916 81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	697 /* Call the base tp_dealloc(); first retrack self if
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	698 * basedealloc knows about gc.
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	699 */
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	700 if (PyType_IS_GC(base))
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	701 _PyObject_GC_TRACK(self);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	702 assert(basedealloc);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	703 basedealloc(self);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	704
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	705 /* Can't reference self beyond this point */
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	706 Py_DECREF(type);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	707
24653 1ab27c1770df Fix a subtle bug in the trashcan code I added yesterday to Guido van Rossum <guido@python.org> parents: 24614 diff changeset	708 endlabel:
27707 e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	709 ++_PyTrash_delete_nesting;
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	710 Py_TRASHCAN_SAFE_END(self);
27707 e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	711 --_PyTrash_delete_nesting;
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	712
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	713 /* Explanation of the weirdness around the trashcan macros:
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	714
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	715 Q. What do the trashcan macros do?
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	716
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	717 A. Read the comment titled "Trashcan mechanism" in object.h.
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	718 For one, this explains why there must be a call to GC-untrack
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	719 before the trashcan begin macro. Without understanding the
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	720 trashcan code, the answers to the following questions don't make
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	721 sense.
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	722
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	723 Q. Why do we GC-untrack before the trashcan and then immediately
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	724 GC-track again afterward?
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	725
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	726 A. In the case that the base class is GC-aware, the base class
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	727 probably GC-untracks the object. If it does that using the
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	728 UNTRACK macro, this will crash when the object is already
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	729 untracked. Because we don't know what the base class does, the
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	730 only safe thing is to make sure the object is tracked when we
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	731 call the base class dealloc. But... The trashcan begin macro
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	732 requires that the object is untracked before it is called. So
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	733 the dance becomes:
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	734
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	735 GC untrack
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	736 trashcan begin
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	737 GC track
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	738
30916 81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	739 Q. Why did the last question say "immediately GC-track again"?
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	740 It's nowhere near immediately.
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	741
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	742 A. Because the code used to re-track immediately. Bad Idea.
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	743 self has a refcount of 0, and if gc ever gets its hands on it
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	744 (which can happen if any weakref callback gets invoked), it
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	745 looks like trash to gc too, and gc also tries to delete self
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	746 then. But we're already deleting self. Double dealloction is
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	747 a subtle disaster.
81733c7a95c8 subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30908 diff changeset	748
27707 e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	749 Q. Why the bizarre (net-zero) manipulation of
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	750 _PyTrash_delete_nesting around the trashcan macros?
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	751
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	752 A. Some base classes (e.g. list) also use the trashcan mechanism.
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	753 The following scenario used to be possible:
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	754
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	755 - suppose the trashcan level is one below the trashcan limit
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	756
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	757 - subtype_dealloc() is called
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	758
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	759 - the trashcan limit is not yet reached, so the trashcan level
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	760 is incremented and the code between trashcan begin and end is
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	761 executed
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	762
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	763 - this destroys much of the object's contents, including its
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	764 slots and __dict__
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	765
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	766 - basedealloc() is called; this is really list_dealloc(), or
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	767 some other type which also uses the trashcan macros
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	768
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	769 - the trashcan limit is now reached, so the object is put on the
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	770 trashcan's to-be-deleted-later list
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	771
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	772 - basedealloc() returns
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	773
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	774 - subtype_dealloc() decrefs the object's type
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	775
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	776 - subtype_dealloc() returns
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	777
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	778 - later, the trashcan code starts deleting the objects from its
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	779 to-be-deleted-later list
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	780
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	781 - subtype_dealloc() is called AGAIN for the same object
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	782
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	783 - at the very least (if the destroyed slots and __dict__ don't
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	784 cause problems) the object's type gets decref'ed a second
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	785 time, which is BAD!!!
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	786
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	787 The remedy is to make sure that if the code between trashcan
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	788 begin and end in subtype_dealloc() is called, the code between
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	789 trashcan begin and end in basedealloc() will also be called.
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	790 This is done by decrementing the level after passing into the
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	791 trashcan block, and incrementing it just before leaving the
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	792 block.
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	793
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	794 But now it's possible that a chain of objects consisting solely
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	795 of objects whose deallocator is subtype_dealloc() will defeat
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	796 the trashcan mechanism completely: the decremented level means
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	797 that the effective level never reaches the limit. Therefore, we
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	798 increment the level before entering the trashcan block, and
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	799 matchingly decrement it after leaving. This means the trashcan
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	800 code will trigger a little early, but that's no big deal.
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	801
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	802 Q. Are there any live examples of code in need of all this
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	803 complexity?
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	804
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	805 A. Yes. See SF bug 668433 for code that crashed (when Python was
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	806 compiled in debug mode) before the trashcan level manipulations
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	807 were added. For more discussion, see SF patches 581742, 575073
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	808 and bug 574207.
e0fa52067dbe Fix for SF #668433. I'm not explaining it here; ample comments are in Guido van Rossum <guido@python.org> parents: 27132 diff changeset	809 */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	810 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	811
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	812 static PyTypeObject solid_base(PyTypeObject type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	813
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	814 /* type test with subclassing support */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	815
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	816 int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	817 PyType_IsSubtype(PyTypeObject a, PyTypeObject b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	818 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	819 PyObject *mro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	820
19803 32cfce4d83dc PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing Guido van Rossum <guido@python.org> parents: 19630 diff changeset	821 if (!(a->tp_flags & Py_TPFLAGS_HAVE_CLASS))
32cfce4d83dc PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing Guido van Rossum <guido@python.org> parents: 19630 diff changeset	822 return b == a \|\| b == &PyBaseObject_Type;
32cfce4d83dc PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing Guido van Rossum <guido@python.org> parents: 19630 diff changeset	823
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	824 mro = a->tp_mro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	825 if (mro != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	826 /* Deal with multiple inheritance without recursion
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	827 by walking the MRO tuple */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	828 int i, n;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	829 assert(PyTuple_Check(mro));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	830 n = PyTuple_GET_SIZE(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	831 for (i = 0; i < n; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	832 if (PyTuple_GET_ITEM(mro, i) == (PyObject *)b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	833 return 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	834 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	835 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	836 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	837 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	838 /* a is not completely initilized yet; follow tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	839 do {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	840 if (a == b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	841 return 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	842 a = a->tp_base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	843 } while (a != NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	844 return b == &PyBaseObject_Type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	845 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	846 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	847
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	848 /* Internal routines to do a method lookup in the type
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	849 without looking in the instance dictionary
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	850 (so we can't use PyObject_GetAttr) but still binding
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	851 it to the instance. The arguments are the object,
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	852 the method name as a C string, and the address of a
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	853 static variable used to cache the interned Python string.
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	854
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	855 Two variants:
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	856
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	857 - lookup_maybe() returns NULL without raising an exception
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	858 when the _PyType_Lookup() call fails;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	859
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	860 - lookup_method() always raises an exception upon errors.
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	861 */
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	862
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	863 static PyObject *
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	864 lookup_maybe(PyObject self, char attrstr, PyObject **attrobj)
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	865 {
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	866 PyObject *res;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	867
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	868 if (*attrobj == NULL) {
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	869 *attrobj = PyString_InternFromString(attrstr);
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	870 if (*attrobj == NULL)
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	871 return NULL;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	872 }
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	873 res = _PyType_Lookup(self->ob_type, *attrobj);
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	874 if (res != NULL) {
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	875 descrgetfunc f;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	876 if ((f = res->ob_type->tp_descr_get) == NULL)
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	877 Py_INCREF(res);
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	878 else
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	879 res = f(res, self, (PyObject *)(self->ob_type));
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	880 }
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	881 return res;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	882 }
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	883
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	884 static PyObject *
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	885 lookup_method(PyObject self, char attrstr, PyObject **attrobj)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	886 {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	887 PyObject *res = lookup_maybe(self, attrstr, attrobj);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	888 if (res == NULL && !PyErr_Occurred())
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	889 PyErr_SetObject(PyExc_AttributeError, *attrobj);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	890 return res;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	891 }
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	892
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	893 /* A variation of PyObject_CallMethod that uses lookup_method()
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	894 instead of PyObject_GetAttrString(). This uses the same convention
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	895 as lookup_method to cache the interned name string object. */
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	896
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	897 static PyObject *
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	898 call_method(PyObject o, char name, PyObject *nameobj, char format, ...)
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	899 {
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	900 va_list va;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	901 PyObject args, func = 0, *retval;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	902 va_start(va, format);
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	903
20225 aa18c0ecc4fb call_method(), call_maybe(): fix a performance bug: the argument Guido van Rossum <guido@python.org> parents: 20220 diff changeset	904 func = lookup_maybe(o, name, nameobj);
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	905 if (func == NULL) {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	906 va_end(va);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	907 if (!PyErr_Occurred())
20225 aa18c0ecc4fb call_method(), call_maybe(): fix a performance bug: the argument Guido van Rossum <guido@python.org> parents: 20220 diff changeset	908 PyErr_SetObject(PyExc_AttributeError, *nameobj);
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	909 return NULL;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	910 }
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	911
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	912 if (format && *format)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	913 args = Py_VaBuildValue(format, va);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	914 else
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	915 args = PyTuple_New(0);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	916
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	917 va_end(va);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	918
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	919 if (args == NULL)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	920 return NULL;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	921
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	922 assert(PyTuple_Check(args));
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	923 retval = PyObject_Call(func, args, NULL);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	924
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	925 Py_DECREF(args);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	926 Py_DECREF(func);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	927
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	928 return retval;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	929 }
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	930
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	931 /* Clone of call_method() that returns NotImplemented when the lookup fails. */
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	932
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	933 static PyObject *
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	934 call_maybe(PyObject o, char name, PyObject *nameobj, char format, ...)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	935 {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	936 va_list va;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	937 PyObject args, func = 0, *retval;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	938 va_start(va, format);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	939
20225 aa18c0ecc4fb call_method(), call_maybe(): fix a performance bug: the argument Guido van Rossum <guido@python.org> parents: 20220 diff changeset	940 func = lookup_maybe(o, name, nameobj);
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	941 if (func == NULL) {
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	942 va_end(va);
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	943 if (!PyErr_Occurred()) {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	944 Py_INCREF(Py_NotImplemented);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	945 return Py_NotImplemented;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	946 }
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	947 return NULL;
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	948 }
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	949
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	950 if (format && *format)
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	951 args = Py_VaBuildValue(format, va);
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	952 else
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	953 args = PyTuple_New(0);
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	954
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	955 va_end(va);
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	956
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	957 if (args == NULL)
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	958 return NULL;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	959
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	960 assert(PyTuple_Check(args));
cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	961 retval = PyObject_Call(func, args, NULL);
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	962
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	963 Py_DECREF(args);
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	964 Py_DECREF(func);
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	965
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	966 return retval;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	967 }
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	968
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	969 static int
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	970 fill_classic_mro(PyObject mro, PyObject cls)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	971 {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	972 PyObject bases, base;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	973 int i, n;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	974
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	975 assert(PyList_Check(mro));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	976 assert(PyClass_Check(cls));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	977 i = PySequence_Contains(mro, cls);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	978 if (i < 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	979 return -1;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	980 if (!i) {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	981 if (PyList_Append(mro, cls) < 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	982 return -1;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	983 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	984 bases = ((PyClassObject *)cls)->cl_bases;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	985 assert(bases && PyTuple_Check(bases));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	986 n = PyTuple_GET_SIZE(bases);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	987 for (i = 0; i < n; i++) {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	988 base = PyTuple_GET_ITEM(bases, i);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	989 if (fill_classic_mro(mro, base) < 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	990 return -1;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	991 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	992 return 0;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	993 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	994
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	995 static PyObject *
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	996 classic_mro(PyObject *cls)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	997 {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	998 PyObject *mro;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	999
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1000 assert(PyClass_Check(cls));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1001 mro = PyList_New(0);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1002 if (mro != NULL) {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1003 if (fill_classic_mro(mro, cls) == 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1004 return mro;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1005 Py_DECREF(mro);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1006 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1007 return NULL;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1008 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1009
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1010 /*
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1011 Method resolution order algorithm C3 described in
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1012 "A Monotonic Superclass Linearization for Dylan",
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1013 by Kim Barrett, Bob Cassel, Paul Haahr,
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1014 David A. Moon, Keith Playford, and P. Tucker Withington.
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1015 (OOPSLA 1996)
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1016
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1017 Some notes about the rules implied by C3:
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1018
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1019 No duplicate bases.
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1020 It isn't legal to repeat a class in a list of base classes.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1021
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1022 The next three properties are the 3 constraints in "C3".
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1023
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1024 Local precendece order.
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1025 If A precedes B in C's MRO, then A will precede B in the MRO of all
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1026 subclasses of C.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1027
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1028 Monotonicity.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1029 The MRO of a class must be an extension without reordering of the
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1030 MRO of each of its superclasses.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1031
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1032 Extended Precedence Graph (EPG).
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1033 Linearization is consistent if there is a path in the EPG from
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1034 each class to all its successors in the linearization. See
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1035 the paper for definition of EPG.
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1036 */
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1037
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1038 static int
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1039 tail_contains(PyObject list, int whence, PyObject o) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1040 int j, size;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1041 size = PyList_GET_SIZE(list);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1042
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1043 for (j = whence+1; j < size; j++) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1044 if (PyList_GET_ITEM(list, j) == o)
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1045 return 1;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1046 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1047 return 0;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1048 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1049
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1050 static PyObject *
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1051 class_name(PyObject *cls)
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1052 {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1053 PyObject *name = PyObject_GetAttrString(cls, "__name__");
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1054 if (name == NULL) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1055 PyErr_Clear();
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1056 Py_XDECREF(name);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1057 name = PyObject_Repr(cls);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1058 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1059 if (name == NULL)
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1060 return NULL;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1061 if (!PyString_Check(name)) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1062 Py_DECREF(name);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1063 return NULL;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1064 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1065 return name;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1066 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1067
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1068 static int
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1069 check_duplicates(PyObject *list)
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1070 {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1071 int i, j, n;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1072 /* Let's use a quadratic time algorithm,
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1073 assuming that the bases lists is short.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1074 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1075 n = PyList_GET_SIZE(list);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1076 for (i = 0; i < n; i++) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1077 PyObject *o = PyList_GET_ITEM(list, i);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1078 for (j = i + 1; j < n; j++) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1079 if (PyList_GET_ITEM(list, j) == o) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1080 o = class_name(o);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1081 PyErr_Format(PyExc_TypeError,
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1082 "duplicate base class %s",
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1083 o ? PyString_AS_STRING(o) : "?");
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1084 Py_XDECREF(o);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1085 return -1;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1086 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1087 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1088 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1089 return 0;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1090 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1091
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1092 /* Raise a TypeError for an MRO order disagreement.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1093
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1094 It's hard to produce a good error message. In the absence of better
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1095 insight into error reporting, report the classes that were candidates
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1096 to be put next into the MRO. There is some conflict between the
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1097 order in which they should be put in the MRO, but it's hard to
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1098 diagnose what constraint can't be satisfied.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1099 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1100
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1101 static void
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1102 set_mro_error(PyObject to_merge, int remain)
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1103 {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1104 int i, n, off, to_merge_size;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1105 char buf[1000];
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1106 PyObject k, v;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1107 PyObject *set = PyDict_New();
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1108
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1109 to_merge_size = PyList_GET_SIZE(to_merge);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1110 for (i = 0; i < to_merge_size; i++) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1111 PyObject *L = PyList_GET_ITEM(to_merge, i);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1112 if (remain[i] < PyList_GET_SIZE(L)) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1113 PyObject *c = PyList_GET_ITEM(L, remain[i]);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1114 if (PyDict_SetItem(set, c, Py_None) < 0)
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1115 return;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1116 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1117 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1118 n = PyDict_Size(set);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1119
28514 9400504cb0b2 SF bug #699934: Obscure error message Raymond Hettinger <python@rcn.com> parents: 28403 diff changeset	1120 off = PyOS_snprintf(buf, sizeof(buf), "Cannot create a \
9400504cb0b2 SF bug #699934: Obscure error message Raymond Hettinger <python@rcn.com> parents: 28403 diff changeset	1121 consistent method resolution\norder (MRO) for bases");
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1122 i = 0;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1123 while (PyDict_Next(set, &i, &k, &v) && off < sizeof(buf)) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1124 PyObject *name = class_name(k);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1125 off += PyOS_snprintf(buf + off, sizeof(buf) - off, " %s",
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1126 name ? PyString_AS_STRING(name) : "?");
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1127 Py_XDECREF(name);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1128 if (--n && off+1 < sizeof(buf)) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1129 buf[off++] = ',';
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1130 buf[off] = '\0';
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1131 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1132 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1133 PyErr_SetString(PyExc_TypeError, buf);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1134 Py_DECREF(set);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1135 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1136
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1137 static int
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1138 pmerge(PyObject acc, PyObject to_merge) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1139 int i, j, to_merge_size;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1140 int *remain;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1141 int ok, empty_cnt;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1142
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1143 to_merge_size = PyList_GET_SIZE(to_merge);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1144
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1145 /* remain stores an index into each sublist of to_merge.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1146 remain[i] is the index of the next base in to_merge[i]
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1147 that is not included in acc.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1148 */
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1149 remain = PyMem_MALLOC(SIZEOF_INT*to_merge_size);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1150 if (remain == NULL)
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1151 return -1;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1152 for (i = 0; i < to_merge_size; i++)
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1153 remain[i] = 0;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1154
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1155 again:
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1156 empty_cnt = 0;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1157 for (i = 0; i < to_merge_size; i++) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1158 PyObject *candidate;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1159
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1160 PyObject *cur_list = PyList_GET_ITEM(to_merge, i);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1161
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1162 if (remain[i] >= PyList_GET_SIZE(cur_list)) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1163 empty_cnt++;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1164 continue;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1165 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1166
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1167 /* Choose next candidate for MRO.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1168
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1169 The input sequences alone can determine the choice.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1170 If not, choose the class which appears in the MRO
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1171 of the earliest direct superclass of the new class.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1172 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1173
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1174 candidate = PyList_GET_ITEM(cur_list, remain[i]);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1175 for (j = 0; j < to_merge_size; j++) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1176 PyObject *j_lst = PyList_GET_ITEM(to_merge, j);
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1177 if (tail_contains(j_lst, remain[j], candidate)) {
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1178 goto skip; /* continue outer loop */
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1179 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1180 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1181 ok = PyList_Append(acc, candidate);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1182 if (ok < 0) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1183 PyMem_Free(remain);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1184 return -1;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1185 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1186 for (j = 0; j < to_merge_size; j++) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1187 PyObject *j_lst = PyList_GET_ITEM(to_merge, j);
26964 5df7a284eaf4 Fix an out-of-bound index in pmerge() discovered by Zooko (SF bug Guido van Rossum <guido@python.org> parents: 26660 diff changeset	1188 if (remain[j] < PyList_GET_SIZE(j_lst) &&
5df7a284eaf4 Fix an out-of-bound index in pmerge() discovered by Zooko (SF bug Guido van Rossum <guido@python.org> parents: 26660 diff changeset	1189 PyList_GET_ITEM(j_lst, remain[j]) == candidate) {
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1190 remain[j]++;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1191 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1192 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1193 goto again;
26227 529719a5350e Repaired illegal syntax most compilers probably let slide (but MSVC Tim Peters <tim.peters@gmail.com> parents: 26222 diff changeset	1194 skip: ;
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1195 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1196
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1197 if (empty_cnt == to_merge_size) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1198 PyMem_FREE(remain);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1199 return 0;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1200 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1201 set_mro_error(to_merge, remain);
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1202 PyMem_FREE(remain);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1203 return -1;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1204 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1205
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1206 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1207 mro_implementation(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1208 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1209 int i, n, ok;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1210 PyObject bases, result;
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1211 PyObject to_merge, bases_aslist;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1212
23903 066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1213 if(type->tp_dict == NULL) {
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1214 if(PyType_Ready(type) < 0)
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1215 return NULL;
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1216 }
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1217
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1218 /* Find a superclass linearization that honors the constraints
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1219 of the explicit lists of bases and the constraints implied by
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1220 each base class.
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1221
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1222 to_merge is a list of lists, where each list is a superclass
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1223 linearization implied by a base class. The last element of
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1224 to_merge is the declared list of bases.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1225 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1226
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1227 bases = type->tp_bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1228 n = PyTuple_GET_SIZE(bases);
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1229
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1230 to_merge = PyList_New(n+1);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1231 if (to_merge == NULL)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1232 return NULL;
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1233
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1234 for (i = 0; i < n; i++) {
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1235 PyObject *base = PyTuple_GET_ITEM(bases, i);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1236 PyObject *parentMRO;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1237 if (PyType_Check(base))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1238 parentMRO = PySequence_List(
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1239 ((PyTypeObject*)base)->tp_mro);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1240 else
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1241 parentMRO = classic_mro(base);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1242 if (parentMRO == NULL) {
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1243 Py_DECREF(to_merge);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1244 return NULL;
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1245 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1246
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1247 PyList_SET_ITEM(to_merge, i, parentMRO);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1248 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1249
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1250 bases_aslist = PySequence_List(bases);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1251 if (bases_aslist == NULL) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1252 Py_DECREF(to_merge);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1253 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1254 }
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1255 /* This is just a basic sanity check. */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1256 if (check_duplicates(bases_aslist) < 0) {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1257 Py_DECREF(to_merge);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1258 Py_DECREF(bases_aslist);
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1259 return NULL;
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1260 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1261 PyList_SET_ITEM(to_merge, n, bases_aslist);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1262
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1263 result = Py_BuildValue("[O]", (PyObject *)type);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1264 if (result == NULL) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1265 Py_DECREF(to_merge);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1266 return NULL;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1267 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1268
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1269 ok = pmerge(result, to_merge);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1270 Py_DECREF(to_merge);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1271 if (ok < 0) {
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1272 Py_DECREF(result);
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1273 return NULL;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1274 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1275
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1276 return result;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1277 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1278
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1279 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19300 diff changeset	1280 mro_external(PyObject *self)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1281 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1282 PyTypeObject type = (PyTypeObject )self;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1283
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1284 return mro_implementation(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1285 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1286
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1287 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1288 mro_internal(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1289 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1290 PyObject mro, result, *tuple;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1291
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1292 if (type->ob_type == &PyType_Type) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1293 result = mro_implementation(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1294 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1295 else {
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	1296 static PyObject *mro_str;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	1297 mro = lookup_method((PyObject *)type, "mro", &mro_str);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1298 if (mro == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1299 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1300 result = PyObject_CallObject(mro, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1301 Py_DECREF(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1302 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1303 if (result == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1304 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1305 tuple = PySequence_Tuple(result);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1306 Py_DECREF(result);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1307 type->tp_mro = tuple;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1308 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1309 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1310
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1311
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1312 /* Calculate the best base amongst multiple base classes.
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1313 This is the first one that's on the path to the "solid base". */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1314
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1315 static PyTypeObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1316 best_base(PyObject *bases)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1317 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1318 int i, n;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1319 PyTypeObject base, winner, candidate, base_i;
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1320 PyObject *base_proto;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1321
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1322 assert(PyTuple_Check(bases));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1323 n = PyTuple_GET_SIZE(bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1324 assert(n > 0);
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1325 base = NULL;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1326 winner = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1327 for (i = 0; i < n; i++) {
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1328 base_proto = PyTuple_GET_ITEM(bases, i);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1329 if (PyClass_Check(base_proto))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1330 continue;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1331 if (!PyType_Check(base_proto)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1332 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1333 PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1334 "bases must be types");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1335 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1336 }
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1337 base_i = (PyTypeObject *)base_proto;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1338 if (base_i->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	1339 if (PyType_Ready(base_i) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1340 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1341 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1342 candidate = solid_base(base_i);
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1343 if (winner == NULL) {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1344 winner = candidate;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1345 base = base_i;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1346 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1347 else if (PyType_IsSubtype(winner, candidate))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1348 ;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1349 else if (PyType_IsSubtype(candidate, winner)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1350 winner = candidate;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1351 base = base_i;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1352 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1353 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1354 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1355 PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1356 "multiple bases have "
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1357 "instance lay-out conflict");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1358 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1359 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1360 }
21404 064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1361 if (base == NULL)
064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1362 PyErr_SetString(PyExc_TypeError,
064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1363 "a new-style class can't have only classic bases");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1364 return base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1365 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1366
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1367 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1368 extra_ivars(PyTypeObject type, PyTypeObject base)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1369 {
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	1370 size_t t_size = type->tp_basicsize;
13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	1371 size_t b_size = base->tp_basicsize;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1372
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1373 assert(t_size >= b_size); /* Else type smaller than base! */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1374 if (type->tp_itemsize \|\| base->tp_itemsize) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1375 /* If itemsize is involved, stricter rules */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1376 return t_size != b_size \|\|
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1377 type->tp_itemsize != base->tp_itemsize;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1378 }
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1379 if (type->tp_weaklistoffset && base->tp_weaklistoffset == 0 &&
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1380 type->tp_weaklistoffset + sizeof(PyObject *) == t_size)
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1381 t_size -= sizeof(PyObject *);
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1382 if (type->tp_dictoffset && base->tp_dictoffset == 0 &&
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1383 type->tp_dictoffset + sizeof(PyObject *) == t_size)
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1384 t_size -= sizeof(PyObject *);
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1385
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1386 return t_size != b_size;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1387 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1388
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1389 static PyTypeObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1390 solid_base(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1391 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1392 PyTypeObject *base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1393
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1394 if (type->tp_base)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1395 base = solid_base(type->tp_base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1396 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1397 base = &PyBaseObject_Type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1398 if (extra_ivars(type, base))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1399 return type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1400 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1401 return base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1402 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1403
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1404 static void object_dealloc(PyObject *);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1405 static int object_init(PyObject , PyObject , PyObject *);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1406 static int update_slot(PyTypeObject , PyObject );
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1407 static void fixup_slot_dispatchers(PyTypeObject *);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1408
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1409 static PyObject *
19616 337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1410 subtype_dict(PyObject obj, void context)
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1411 {
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1412 PyObject **dictptr = _PyObject_GetDictPtr(obj);
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1413 PyObject *dict;
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1414
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1415 if (dictptr == NULL) {
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1416 PyErr_SetString(PyExc_AttributeError,
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1417 "This object has no __dict__");
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1418 return NULL;
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1419 }
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1420 dict = *dictptr;
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1421 if (dict == NULL)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1422 *dictptr = dict = PyDict_New();
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1423 Py_XINCREF(dict);
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1424 return dict;
19616 337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1425 }
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1426
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1427 static int
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1428 subtype_setdict(PyObject obj, PyObject value, void *context)
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1429 {
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1430 PyObject **dictptr = _PyObject_GetDictPtr(obj);
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1431 PyObject *dict;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1432
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1433 if (dictptr == NULL) {
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1434 PyErr_SetString(PyExc_AttributeError,
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1435 "This object has no __dict__");
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1436 return -1;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1437 }
21235 b782490da7f0 At the PythonLabs meeting someone mentioned it would make Jim really Guido van Rossum <guido@python.org> parents: 21192 diff changeset	1438 if (value != NULL && !PyDict_Check(value)) {
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1439 PyErr_SetString(PyExc_TypeError,
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1440 "__dict__ must be set to a dictionary");
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1441 return -1;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1442 }
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1443 dict = *dictptr;
21235 b782490da7f0 At the PythonLabs meeting someone mentioned it would make Jim really Guido van Rossum <guido@python.org> parents: 21192 diff changeset	1444 Py_XINCREF(value);
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1445 *dictptr = value;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1446 Py_XDECREF(dict);
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1447 return 0;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1448 }
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1449
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1450 static PyObject *
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1451 subtype_getweakref(PyObject obj, void context)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1452 {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1453 PyObject **weaklistptr;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1454 PyObject *result;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1455
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1456 if (obj->ob_type->tp_weaklistoffset == 0) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1457 PyErr_SetString(PyExc_AttributeError,
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1458 "This object has no __weaklist__");
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1459 return NULL;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1460 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1461 assert(obj->ob_type->tp_weaklistoffset > 0);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1462 assert(obj->ob_type->tp_weaklistoffset + sizeof(PyObject *) <=
24762 ccf66a1aa0b8 Fix MSVC warnings. Guido van Rossum <guido@python.org> parents: 24761 diff changeset	1463 (size_t)(obj->ob_type->tp_basicsize));
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1464 weaklistptr = (PyObject **)
24762 ccf66a1aa0b8 Fix MSVC warnings. Guido van Rossum <guido@python.org> parents: 24761 diff changeset	1465 ((char *)obj + obj->ob_type->tp_weaklistoffset);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1466 if (*weaklistptr == NULL)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1467 result = Py_None;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1468 else
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1469 result = *weaklistptr;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1470 Py_INCREF(result);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1471 return result;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1472 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1473
27132 22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1474 /* Three variants on the subtype_getsets list. */
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1475
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1476 static PyGetSetDef subtype_getsets_full[] = {
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1477 {"__dict__", subtype_dict, subtype_setdict,
24785 4de9ac0e4173 Allow docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24762 diff changeset	1478 PyDoc_STR("dictionary for instance variables (if defined)")},
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1479 {"__weakref__", subtype_getweakref, NULL,
24785 4de9ac0e4173 Allow docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24762 diff changeset	1480 PyDoc_STR("list of weak references to the object (if defined)")},
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1481 {0}
19616 337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1482 };
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1483
27132 22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1484 static PyGetSetDef subtype_getsets_dict_only[] = {
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1485 {"__dict__", subtype_dict, subtype_setdict,
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1486 PyDoc_STR("dictionary for instance variables (if defined)")},
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1487 {0}
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1488 };
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1489
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1490 static PyGetSetDef subtype_getsets_weakref_only[] = {
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1491 {"__weakref__", subtype_getweakref, NULL,
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1492 PyDoc_STR("list of weak references to the object (if defined)")},
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1493 {0}
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1494 };
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1495
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1496 static int
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1497 valid_identifier(PyObject *s)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1498 {
24245 50443127b21d valid_identifier(): use an unsigned char* so that isalpha() will do Guido van Rossum <guido@python.org> parents: 24184 diff changeset	1499 unsigned char *p;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1500 int i, n;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1501
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1502 if (!PyString_Check(s)) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1503 PyErr_SetString(PyExc_TypeError,
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1504 "__slots__ must be strings");
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1505 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1506 }
24245 50443127b21d valid_identifier(): use an unsigned char* so that isalpha() will do Guido van Rossum <guido@python.org> parents: 24184 diff changeset	1507 p = (unsigned char *) PyString_AS_STRING(s);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1508 n = PyString_GET_SIZE(s);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1509 /* We must reject an empty name. As a hack, we bump the
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1510 length to 1 so that the loop will balk on the trailing \0. */
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1511 if (n == 0)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1512 n = 1;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1513 for (i = 0; i < n; i++, p++) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1514 if (!(i == 0 ? isalpha(p) : isalnum(p)) && *p != '_') {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1515 PyErr_SetString(PyExc_TypeError,
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1516 "__slots__ must be identifiers");
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1517 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1518 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1519 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1520 return 1;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1521 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1522
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1523 #ifdef Py_USING_UNICODE
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1524 /* Replace Unicode objects in slots. */
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1525
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1526 static PyObject *
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1527 _unicode_to_string(PyObject *slots, int nslots)
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1528 {
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1529 PyObject *tmp = slots;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1530 PyObject o, o1;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1531 int i;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1532 intintargfunc copy = slots->ob_type->tp_as_sequence->sq_slice;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1533 for (i = 0; i < nslots; i++) {
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1534 if (PyUnicode_Check(o = PyTuple_GET_ITEM(tmp, i))) {
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1535 if (tmp == slots) {
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1536 tmp = copy(slots, 0, PyTuple_GET_SIZE(slots));
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1537 if (tmp == NULL)
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1538 return NULL;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1539 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1540 o1 = _PyUnicode_AsDefaultEncodedString
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1541 (o, NULL);
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1542 if (o1 == NULL) {
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1543 Py_DECREF(tmp);
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1544 return 0;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1545 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1546 Py_INCREF(o1);
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1547 Py_DECREF(o);
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1548 PyTuple_SET_ITEM(tmp, i, o1);
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1549 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1550 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1551 return tmp;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1552 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1553 #endif
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1554
19616 337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1555 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1556 type_new(PyTypeObject metatype, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1557 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1558 PyObject name, bases, *dict;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1559 static char *kwlist[] = {"name", "bases", "dict", 0};
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1560 PyObject slots, tmp, *newslots;
19329 f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1561 PyTypeObject type, base, tmptype, winner;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	1562 PyHeapTypeObject *et;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	1563 PyMemberDef *mp;
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	1564 int i, nbases, nslots, slotoffset, add_dict, add_weak;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1565 int j, may_add_dict, may_add_weak;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1566
20725 7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1567 assert(args != NULL && PyTuple_Check(args));
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1568 assert(kwds == NULL \|\| PyDict_Check(kwds));
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1569
19329 f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1570 /* Special case: type(x) should return x->ob_type */
20725 7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1571 {
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1572 const int nargs = PyTuple_GET_SIZE(args);
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1573 const int nkwds = kwds == NULL ? 0 : PyDict_Size(kwds);
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1574
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1575 if (PyType_CheckExact(metatype) && nargs == 1 && nkwds == 0) {
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1576 PyObject *x = PyTuple_GET_ITEM(args, 0);
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1577 Py_INCREF(x->ob_type);
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1578 return (PyObject *) x->ob_type;
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1579 }
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1580
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1581 /* SF bug 475327 -- if that didn't trigger, we need 3
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1582 arguments. but PyArg_ParseTupleAndKeywords below may give
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1583 a msg saying type() needs exactly 3. */
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1584 if (nargs + nkwds != 3) {
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1585 PyErr_SetString(PyExc_TypeError,
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1586 "type() takes 1 or 3 arguments");
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1587 return NULL;
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1588 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1589 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1590
19329 f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1591 /* Check arguments: (name, bases, dict) */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1592 if (!PyArg_ParseTupleAndKeywords(args, kwds, "SO!O!:type", kwlist,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1593 &name,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1594 &PyTuple_Type, &bases,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1595 &PyDict_Type, &dict))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1596 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1597
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1598 /* Determine the proper metatype to deal with this,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1599 and check for metatype conflicts while we're at it.
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1600 Note that if some other metatype wins to contract,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1601 it's possible that its instances are not types. */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1602 nbases = PyTuple_GET_SIZE(bases);
19329 f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1603 winner = metatype;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1604 for (i = 0; i < nbases; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1605 tmp = PyTuple_GET_ITEM(bases, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1606 tmptype = tmp->ob_type;
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1607 if (tmptype == &PyClass_Type)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1608 continue; /* Special case classic classes */
19329 f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1609 if (PyType_IsSubtype(winner, tmptype))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1610 continue;
19329 f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1611 if (PyType_IsSubtype(tmptype, winner)) {
f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1612 winner = tmptype;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1613 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1614 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1615 PyErr_SetString(PyExc_TypeError,
28737 d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1616 "metaclass conflict: "
d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1617 "the metaclass of a derived class "
d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1618 "must be a (non-strict) subclass "
d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1619 "of the metaclasses of all its bases");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1620 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1621 }
19329 f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1622 if (winner != metatype) {
f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1623 if (winner->tp_new != type_new) /* Pass it to the winner */
f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1624 return winner->tp_new(winner, args, kwds);
f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1625 metatype = winner;
f93c16c10a55 type_new(): only defer to the winning metatype if it's different from Guido van Rossum <guido@python.org> parents: 19316 diff changeset	1626 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1627
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1628 /* Adjust for empty tuple bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1629 if (nbases == 0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1630 bases = Py_BuildValue("(O)", &PyBaseObject_Type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1631 if (bases == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1632 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1633 nbases = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1634 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1635 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1636 Py_INCREF(bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1637
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1638 /* XXX From here until type is allocated, "return NULL" leaks bases! */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1639
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1640 /* Calculate best base, and check that all bases are type objects */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1641 base = best_base(bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1642 if (base == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1643 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1644 if (!PyType_HasFeature(base, Py_TPFLAGS_BASETYPE)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1645 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1646 "type '%.100s' is not an acceptable base type",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1647 base->tp_name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1648 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1649 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1650
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1651 /* Check for a __slots__ sequence variable in dict, and count it */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1652 slots = PyDict_GetItemString(dict, "__slots__");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1653 nslots = 0;
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1654 add_dict = 0;
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1655 add_weak = 0;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1656 may_add_dict = base->tp_dictoffset == 0;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1657 may_add_weak = base->tp_weaklistoffset == 0 && base->tp_itemsize == 0;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1658 if (slots == NULL) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1659 if (may_add_dict) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1660 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1661 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1662 if (may_add_weak) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1663 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1664 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1665 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1666 else {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1667 /* Have slots */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1668
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1669 /* Make it into a tuple */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1670 if (PyString_Check(slots))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1671 slots = Py_BuildValue("(O)", slots);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1672 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1673 slots = PySequence_Tuple(slots);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1674 if (slots == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1675 return NULL;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1676 assert(PyTuple_Check(slots));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1677
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1678 /* Are slots allowed? */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1679 nslots = PyTuple_GET_SIZE(slots);
29899 434b6cda4fa5 Remove unnecessary check in tests for slots allowed. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29611 diff changeset	1680 if (nslots > 0 && base->tp_itemsize != 0) {
19595 db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1681 PyErr_Format(PyExc_TypeError,
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1682 "nonempty __slots__ "
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1683 "not supported for subtype of '%s'",
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1684 base->tp_name);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1685 bad_slots:
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1686 Py_DECREF(slots);
19595 db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1687 return NULL;
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1688 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1689
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1690 #ifdef Py_USING_UNICODE
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1691 tmp = _unicode_to_string(slots, nslots);
25793 b858f4c883dd Don't drop old slots if _unicode_to_string did not change anything. Martin v. Löwis <martin@v.loewis.de> parents: 25792 diff changeset	1692 if (tmp != slots) {
b858f4c883dd Don't drop old slots if _unicode_to_string did not change anything. Martin v. Löwis <martin@v.loewis.de> parents: 25792 diff changeset	1693 Py_DECREF(slots);
b858f4c883dd Don't drop old slots if _unicode_to_string did not change anything. Martin v. Löwis <martin@v.loewis.de> parents: 25792 diff changeset	1694 slots = tmp;
b858f4c883dd Don't drop old slots if _unicode_to_string did not change anything. Martin v. Löwis <martin@v.loewis.de> parents: 25792 diff changeset	1695 }
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1696 if (!tmp)
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1697 return NULL;
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1698 #endif
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1699 /* Check for valid slot names and two special cases */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1700 for (i = 0; i < nslots; i++) {
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1701 PyObject *tmp = PyTuple_GET_ITEM(slots, i);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1702 char *s;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1703 if (!valid_identifier(tmp))
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1704 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1705 assert(PyString_Check(tmp));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1706 s = PyString_AS_STRING(tmp);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1707 if (strcmp(s, "__dict__") == 0) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1708 if (!may_add_dict \|\| add_dict) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1709 PyErr_SetString(PyExc_TypeError,
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1710 "__dict__ slot disallowed: "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1711 "we already got one");
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1712 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1713 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1714 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1715 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1716 if (strcmp(s, "__weakref__") == 0) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1717 if (!may_add_weak \|\| add_weak) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1718 PyErr_SetString(PyExc_TypeError,
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1719 "__weakref__ slot disallowed: "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1720 "either we already got one, "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1721 "or __itemsize__ != 0");
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1722 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1723 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1724 add_weak++;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1725 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1726 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1727
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1728 /* Copy slots into yet another tuple, demangling names */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1729 newslots = PyTuple_New(nslots - add_dict - add_weak);
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1730 if (newslots == NULL)
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1731 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1732 for (i = j = 0; i < nslots; i++) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1733 char *s;
24862 5b656c3e132b Fix SF bug 595838 -- buffer in type_new() should not be static. Moved Guido van Rossum <guido@python.org> parents: 24825 diff changeset	1734 char buffer[256];
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1735 tmp = PyTuple_GET_ITEM(slots, i);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1736 s = PyString_AS_STRING(tmp);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1737 if ((add_dict && strcmp(s, "__dict__") == 0) \|\|
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1738 (add_weak && strcmp(s, "__weakref__") == 0))
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1739 continue;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1740 if (_Py_Mangle(PyString_AS_STRING(name),
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1741 PyString_AS_STRING(tmp),
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1742 buffer, sizeof(buffer)))
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1743 {
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1744 tmp = PyString_FromString(buffer);
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1745 } else {
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1746 Py_INCREF(tmp);
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1747 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1748 PyTuple_SET_ITEM(newslots, j, tmp);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1749 j++;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1750 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1751 assert(j == nslots - add_dict - add_weak);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1752 nslots = j;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1753 Py_DECREF(slots);
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1754 slots = newslots;
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1755
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1756 /* Secondary bases may provide weakrefs or dict */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1757 if (nbases > 1 &&
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1758 ((may_add_dict && !add_dict) \|\|
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1759 (may_add_weak && !add_weak))) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1760 for (i = 0; i < nbases; i++) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1761 tmp = PyTuple_GET_ITEM(bases, i);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1762 if (tmp == (PyObject *)base)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1763 continue; /* Skip primary base */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1764 if (PyClass_Check(tmp)) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1765 /* Classic base class provides both */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1766 if (may_add_dict && !add_dict)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1767 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1768 if (may_add_weak && !add_weak)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1769 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1770 break;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1771 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1772 assert(PyType_Check(tmp));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1773 tmptype = (PyTypeObject *)tmp;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1774 if (may_add_dict && !add_dict &&
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1775 tmptype->tp_dictoffset != 0)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1776 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1777 if (may_add_weak && !add_weak &&
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1778 tmptype->tp_weaklistoffset != 0)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1779 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1780 if (may_add_dict && !add_dict)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1781 continue;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1782 if (may_add_weak && !add_weak)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1783 continue;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1784 /* Nothing more to check */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1785 break;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1786 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1787 }
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1788 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1789
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1790 /* XXX From here until type is safely allocated,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1791 "return NULL" may leak slots! */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1792
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1793 /* Allocate the type object */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1794 type = (PyTypeObject *)metatype->tp_alloc(metatype, nslots);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1795 if (type == NULL) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1796 Py_XDECREF(slots);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1797 return NULL;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1798 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1799
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1800 /* Keep name and slots alive in the extended type object */
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	1801 et = (PyHeapTypeObject *)type;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1802 Py_INCREF(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1803 et->name = name;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1804 et->slots = slots;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1805
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1806 /* Initialize tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1807 type->tp_flags = Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HEAPTYPE \|
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1808 Py_TPFLAGS_BASETYPE;
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	1809 if (base->tp_flags & Py_TPFLAGS_HAVE_GC)
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	1810 type->tp_flags \|= Py_TPFLAGS_HAVE_GC;
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1811
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1812 /* It's a new-style number unless it specifically inherits any
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1813 old-style numeric behavior */
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1814 if ((base->tp_flags & Py_TPFLAGS_CHECKTYPES) \|\|
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1815 (base->tp_as_number == NULL))
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1816 type->tp_flags \|= Py_TPFLAGS_CHECKTYPES;
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1817
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1818 /* Initialize essential fields */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1819 type->tp_as_number = &et->as_number;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1820 type->tp_as_sequence = &et->as_sequence;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1821 type->tp_as_mapping = &et->as_mapping;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1822 type->tp_as_buffer = &et->as_buffer;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1823 type->tp_name = PyString_AS_STRING(name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1824
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1825 /* Set tp_base and tp_bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1826 type->tp_bases = bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1827 Py_INCREF(base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1828 type->tp_base = base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1829
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	1830 /* Initialize tp_dict from passed-in dict */
27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	1831 type->tp_dict = dict = PyDict_Copy(dict);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1832 if (dict == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1833 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1834 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1835 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1836
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1837 /* Set __module__ in the dict */
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1838 if (PyDict_GetItemString(dict, "__module__") == NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1839 tmp = PyEval_GetGlobals();
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1840 if (tmp != NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1841 tmp = PyDict_GetItemString(tmp, "__name__");
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1842 if (tmp != NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1843 if (PyDict_SetItemString(dict, "__module__",
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1844 tmp) < 0)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1845 return NULL;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1846 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1847 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1848 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1849
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1850 /* Set tp_doc to a copy of dict['__doc__'], if the latter is there
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	1851 and is a string. The __doc__ accessor will first look for tp_doc;
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	1852 if that fails, it will still look into __dict__.
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1853 */
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1854 {
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1855 PyObject *doc = PyDict_GetItemString(dict, "__doc__");
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1856 if (doc != NULL && PyString_Check(doc)) {
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1857 const size_t n = (size_t)PyString_GET_SIZE(doc);
20241 aff6fcd26c15 type_new(): cast PyObject_MALLOC's result to char, for clarity. Tim Peters <tim.peters@gmail.com>* parents: 20239 diff changeset	1858 type->tp_doc = (char *)PyObject_MALLOC(n+1);
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1859 if (type->tp_doc == NULL) {
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1860 Py_DECREF(type);
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1861 return NULL;
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1862 }
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1863 memcpy(type->tp_doc, PyString_AS_STRING(doc), n+1);
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1864 }
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1865 }
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1866
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1867 /* Special-case __new__: if it's a plain function,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1868 make it a static function */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1869 tmp = PyDict_GetItemString(dict, "__new__");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1870 if (tmp != NULL && PyFunction_Check(tmp)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1871 tmp = PyStaticMethod_New(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1872 if (tmp == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1873 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1874 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1875 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1876 PyDict_SetItemString(dict, "__new__", tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1877 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1878 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1879
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1880 /* Add descriptors for custom slots from __slots__, or for __dict__ */
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	1881 mp = PyHeapType_GET_MEMBERS(et);
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	1882 slotoffset = base->tp_basicsize;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1883 if (slots != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1884 for (i = 0; i < nslots; i++, mp++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1885 mp->name = PyString_AS_STRING(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1886 PyTuple_GET_ITEM(slots, i));
21192 c18ad52dece3 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 21151 diff changeset	1887 mp->type = T_OBJECT_EX;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1888 mp->offset = slotoffset;
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1889 if (base->tp_weaklistoffset == 0 &&
21192 c18ad52dece3 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 21151 diff changeset	1890 strcmp(mp->name, "__weakref__") == 0) {
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1891 add_weak++;
21192 c18ad52dece3 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 21151 diff changeset	1892 mp->type = T_OBJECT;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1893 mp->flags = READONLY;
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1894 type->tp_weaklistoffset = slotoffset;
21192 c18ad52dece3 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 21151 diff changeset	1895 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1896 slotoffset += sizeof(PyObject *);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1897 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1898 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1899 if (add_dict) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1900 if (base->tp_itemsize)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1901 type->tp_dictoffset = -(long)sizeof(PyObject *);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1902 else
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1903 type->tp_dictoffset = slotoffset;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1904 slotoffset += sizeof(PyObject *);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1905 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1906 if (add_weak) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1907 assert(!base->tp_itemsize);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1908 type->tp_weaklistoffset = slotoffset;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1909 slotoffset += sizeof(PyObject *);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1910 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1911 type->tp_basicsize = slotoffset;
19616 337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1912 type->tp_itemsize = base->tp_itemsize;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	1913 type->tp_members = PyHeapType_GET_MEMBERS(et);
27132 22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1914
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1915 if (type->tp_weaklistoffset && type->tp_dictoffset)
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1916 type->tp_getset = subtype_getsets_full;
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1917 else if (type->tp_weaklistoffset && !type->tp_dictoffset)
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1918 type->tp_getset = subtype_getsets_weakref_only;
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1919 else if (!type->tp_weaklistoffset && type->tp_dictoffset)
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1920 type->tp_getset = subtype_getsets_dict_only;
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1921 else
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1922 type->tp_getset = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1923
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1924 /* Special case some slots */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1925 if (type->tp_dictoffset != 0 \|\| nslots > 0) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1926 if (base->tp_getattr == NULL && base->tp_getattro == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1927 type->tp_getattro = PyObject_GenericGetAttr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1928 if (base->tp_setattr == NULL && base->tp_setattro == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1929 type->tp_setattro = PyObject_GenericSetAttr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1930 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1931 type->tp_dealloc = subtype_dealloc;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1932
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	1933 /* Enable GC unless there are really no instance variables possible */
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	1934 if (!(type->tp_basicsize == sizeof(PyObject) &&
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	1935 type->tp_itemsize == 0))
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	1936 type->tp_flags \|= Py_TPFLAGS_HAVE_GC;
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	1937
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1938 /* Always override allocation strategy to use regular heap */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1939 type->tp_alloc = PyType_GenericAlloc;
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	1940 if (type->tp_flags & Py_TPFLAGS_HAVE_GC) {
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	1941 type->tp_free = PyObject_GC_Del;
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	1942 type->tp_traverse = subtype_traverse;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1943 type->tp_clear = subtype_clear;
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	1944 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	1945 else
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	1946 type->tp_free = PyObject_Del;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1947
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1948 /* Initialize the rest */
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	1949 if (PyType_Ready(type) < 0) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1950 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1951 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1952 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1953
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	1954 /* Put the proper slots in place */
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	1955 fixup_slot_dispatchers(type);
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	1956
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1957 return (PyObject *)type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1958 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1959
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1960 /* Internal API to look for a name through the MRO.
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1961 This returns a borrowed reference, and doesn't set an exception! */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1962 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1963 _PyType_Lookup(PyTypeObject type, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1964 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1965 int i, n;
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1966 PyObject mro, res, base, dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1967
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	1968 /* Look in tp_dict of types in MRO */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1969 mro = type->tp_mro;
23753 41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1970
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1971 /* If mro is NULL, the type is either not yet initialized
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1972 by PyType_Ready(), or already cleared by type_clear().
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1973 Either way the safest thing to do is to return NULL. */
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1974 if (mro == NULL)
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1975 return NULL;
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1976
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1977 assert(PyTuple_Check(mro));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1978 n = PyTuple_GET_SIZE(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1979 for (i = 0; i < n; i++) {
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1980 base = PyTuple_GET_ITEM(mro, i);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1981 if (PyClass_Check(base))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1982 dict = ((PyClassObject *)base)->cl_dict;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1983 else {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1984 assert(PyType_Check(base));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1985 dict = ((PyTypeObject *)base)->tp_dict;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1986 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1987 assert(dict && PyDict_Check(dict));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1988 res = PyDict_GetItem(dict, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1989 if (res != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1990 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1991 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1992 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1993 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1994
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1995 /* This is similar to PyObject_GenericGetAttr(),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1996 but uses _PyType_Lookup() instead of just looking in type->tp_dict. */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1997 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1998 type_getattro(PyTypeObject type, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1999 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2000 PyTypeObject *metatype = type->ob_type;
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2001 PyObject meta_attribute, attribute;
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2002 descrgetfunc meta_get;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2003
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2004 /* Initialize this type (we'll assume the metatype is initialized) */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2005 if (type->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	2006 if (PyType_Ready(type) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2007 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2008 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2009
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2010 /* No readable descriptor found yet */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2011 meta_get = NULL;
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23967 diff changeset	2012
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2013 /* Look for the attribute in the metatype */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2014 meta_attribute = _PyType_Lookup(metatype, name);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2015
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2016 if (meta_attribute != NULL) {
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2017 meta_get = meta_attribute->ob_type->tp_descr_get;
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23967 diff changeset	2018
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2019 if (meta_get != NULL && PyDescr_IsData(meta_attribute)) {
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2020 /* Data descriptors implement tp_descr_set to intercept
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2021 * writes. Assume the attribute is not overridden in
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2022 * type's tp_dict (and bases): call the descriptor now.
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2023 */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2024 return meta_get(meta_attribute, (PyObject *)type,
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2025 (PyObject *)metatype);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2026 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2027 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2028
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2029 /* No data descriptor found on metatype. Look in tp_dict of this
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2030 * type and its bases */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2031 attribute = _PyType_Lookup(type, name);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2032 if (attribute != NULL) {
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2033 /* Implement descriptor functionality, if any */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2034 descrgetfunc local_get = attribute->ob_type->tp_descr_get;
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2035 if (local_get != NULL) {
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2036 /* NULL 2nd argument indicates the descriptor was
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2037 * found on the target object itself (or a base) */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2038 return local_get(attribute, (PyObject *)NULL,
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2039 (PyObject *)type);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2040 }
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23967 diff changeset	2041
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2042 Py_INCREF(attribute);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2043 return attribute;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2044 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2045
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2046 /* No attribute found in local __dict__ (or bases): use the
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2047 * descriptor from the metatype, if any */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2048 if (meta_get != NULL)
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2049 return meta_get(meta_attribute, (PyObject *)type,
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2050 (PyObject *)metatype);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2051
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2052 /* If an ordinary attribute was found on the metatype, return it now */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2053 if (meta_attribute != NULL) {
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2054 Py_INCREF(meta_attribute);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2055 return meta_attribute;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2056 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2057
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2058 /* Give up */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2059 PyErr_Format(PyExc_AttributeError,
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2060 "type object '%.50s' has no attribute '%.400s'",
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2061 type->tp_name, PyString_AS_STRING(name));
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2062 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2063 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2064
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2065 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2066 type_setattro(PyTypeObject type, PyObject name, PyObject *value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2067 {
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2068 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2069 PyErr_Format(
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2070 PyExc_TypeError,
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2071 "can't set attributes of built-in/extension type '%s'",
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2072 type->tp_name);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2073 return -1;
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	2074 }
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	2075 /* XXX Example of how I expect this to be used...
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	2076 if (update_subclasses(type, name, invalidate_cache, NULL) < 0)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	2077 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	2078 */
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2079 if (PyObject_GenericSetAttr((PyObject *)type, name, value) < 0)
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2080 return -1;
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2081 return update_slot(type, name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2082 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2083
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2084 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2085 type_dealloc(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2086 {
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2087 PyHeapTypeObject *et;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2088
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2089 /* Assert this is a heap-allocated type object */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2090 assert(type->tp_flags & Py_TPFLAGS_HEAPTYPE);
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2091 _PyObject_GC_UNTRACK(type);
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2092 PyObject_ClearWeakRefs((PyObject *)type);
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2093 et = (PyHeapTypeObject *)type;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2094 Py_XDECREF(type->tp_base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2095 Py_XDECREF(type->tp_dict);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2096 Py_XDECREF(type->tp_bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2097 Py_XDECREF(type->tp_mro);
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2098 Py_XDECREF(type->tp_cache);
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2099 Py_XDECREF(type->tp_subclasses);
24427 ea4821964043 SF patch #587889, fix memory leak of tp_doc Neal Norwitz <nnorwitz@gmail.com> parents: 24381 diff changeset	2100 PyObject_Free(type->tp_doc);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2101 Py_XDECREF(et->name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2102 Py_XDECREF(et->slots);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2103 type->ob_type->tp_free((PyObject *)type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2104 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2105
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2106 static PyObject *
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2107 type_subclasses(PyTypeObject type, PyObject args_ignored)
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2108 {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2109 PyObject list, raw, *ref;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2110 int i, n;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2111
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2112 list = PyList_New(0);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2113 if (list == NULL)
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2114 return NULL;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2115 raw = type->tp_subclasses;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2116 if (raw == NULL)
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2117 return list;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2118 assert(PyList_Check(raw));
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2119 n = PyList_GET_SIZE(raw);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2120 for (i = 0; i < n; i++) {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2121 ref = PyList_GET_ITEM(raw, i);
20320 f29b8ea0b695 type_subclasses(): debug build was broken due to typo in new assert(). Tim Peters <tim.peters@gmail.com> parents: 20315 diff changeset	2122 assert(PyWeakref_CheckRef(ref));
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2123 ref = PyWeakref_GET_OBJECT(ref);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2124 if (ref != Py_None) {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2125 if (PyList_Append(list, ref) < 0) {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2126 Py_DECREF(list);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2127 return NULL;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2128 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2129 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2130 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2131 return list;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2132 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2133
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2134 static PyMethodDef type_methods[] = {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 19300 diff changeset	2135 {"mro", (PyCFunction)mro_external, METH_NOARGS,
24795 452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	2136 PyDoc_STR("mro() -> list\nreturn a type's method resolution order")},
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2137 {"__subclasses__", (PyCFunction)type_subclasses, METH_NOARGS,
24795 452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	2138 PyDoc_STR("__subclasses__() -> list of immediate subclasses")},
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2139 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2140 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2141
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	2142 PyDoc_STRVAR(type_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2143 "type(object) -> the object's type\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	2144 "type(name, bases, dict) -> a new type");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2145
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2146 static int
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2147 type_traverse(PyTypeObject type, visitproc visit, void arg)
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2148 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2149 int err;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2150
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2151 /* Because of type_is_gc(), the collector only calls this
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2152 for heaptypes. */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2153 assert(type->tp_flags & Py_TPFLAGS_HEAPTYPE);
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2154
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2155 #define VISIT(SLOT) \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2156 if (SLOT) { \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2157 err = visit((PyObject *)(SLOT), arg); \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2158 if (err) \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2159 return err; \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2160 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2161
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2162 VISIT(type->tp_dict);
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2163 VISIT(type->tp_cache);
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2164 VISIT(type->tp_mro);
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2165 VISIT(type->tp_bases);
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2166 VISIT(type->tp_base);
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2167
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2168 /* There's no need to visit type->tp_subclasses or
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2169 ((PyHeapTypeObject *)type)->slots, because they can't be involved
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2170 in cycles; tp_subclasses is a list of weak references,
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2171 and slots is a tuple of strings. */
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2172
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2173 #undef VISIT
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2174
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2175 return 0;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2176 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2177
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2178 static int
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2179 type_clear(PyTypeObject *type)
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2180 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2181 PyObject *tmp;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2182
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2183 /* Because of type_is_gc(), the collector only calls this
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2184 for heaptypes. */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2185 assert(type->tp_flags & Py_TPFLAGS_HEAPTYPE);
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2186
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2187 #define CLEAR(SLOT) \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2188 if (SLOT) { \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2189 tmp = (PyObject *)(SLOT); \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2190 SLOT = NULL; \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2191 Py_DECREF(tmp); \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2192 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2193
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2194 /* The only field we need to clear is tp_mro, which is part of a
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2195 hard cycle (its first element is the class itself) that won't
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2196 be broken otherwise (it's a tuple and tuples don't have a
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2197 tp_clear handler). None of the other fields need to be
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2198 cleared, and here's why:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2199
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2200 tp_dict:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2201 It is a dict, so the collector will call its tp_clear.
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2202
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2203 tp_cache:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2204 Not used; if it were, it would be a dict.
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2205
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2206 tp_bases, tp_base:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2207 If these are involved in a cycle, there must be at least
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2208 one other, mutable object in the cycle, e.g. a base
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2209 class's dict; the cycle will be broken that way.
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2210
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2211 tp_subclasses:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2212 A list of weak references can't be part of a cycle; and
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2213 lists have their own tp_clear.
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2214
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2215 slots (in PyHeapTypeObject):
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2216 A tuple of strings can't be part of a cycle.
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2217 */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2218
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2219 CLEAR(type->tp_mro);
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2220
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2221 #undef CLEAR
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2222
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2223 return 0;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2224 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2225
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2226 static int
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2227 type_is_gc(PyTypeObject *type)
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2228 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2229 return type->tp_flags & Py_TPFLAGS_HEAPTYPE;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2230 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2231
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2232 PyTypeObject PyType_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2233 PyObject_HEAD_INIT(&PyType_Type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2234 0, /* ob_size */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2235 "type", /* tp_name */
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2236 sizeof(PyHeapTypeObject), /* tp_basicsize */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	2237 sizeof(PyMemberDef), /* tp_itemsize */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2238 (destructor)type_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2239 0, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2240 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2241 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2242 type_compare, /* tp_compare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2243 (reprfunc)type_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2244 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2245 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2246 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2247 (hashfunc)_Py_HashPointer, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2248 (ternaryfunc)type_call, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2249 0, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2250 (getattrofunc)type_getattro, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2251 (setattrofunc)type_setattro, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2252 0, /* tp_as_buffer */
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2253 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2254 Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2255 type_doc, /* tp_doc */
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2256 (traverseproc)type_traverse, /* tp_traverse */
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2257 (inquiry)type_clear, /* tp_clear */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2258 0, /* tp_richcompare */
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2259 offsetof(PyTypeObject, tp_weaklist), /* tp_weaklistoffset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2260 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2261 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2262 type_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2263 type_members, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2264 type_getsets, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2265 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2266 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2267 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2268 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2269 offsetof(PyTypeObject, tp_dict), /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2270 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2271 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2272 type_new, /* tp_new */
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	2273 PyObject_GC_Del, /* tp_free */
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2274 (inquiry)type_is_gc, /* tp_is_gc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2275 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2276
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2277
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2278 /* The base type of all types (eventually)... except itself. */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2279
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2280 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2281 object_init(PyObject self, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2282 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2283 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2284 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2285
27866 bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2286 /* If we don't have a tp_new for a new-style class, new will use this one.
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2287 Therefore this should take no arguments/keywords. However, this new may
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2288 also be inherited by objects that define a tp_init but no tp_new. These
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2289 objects WILL pass argumets to tp_new, because it gets the same args as
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2290 tp_init. So only allow arguments if we aren't using the default init, in
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2291 which case we expect init to handle argument parsing. */
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2292 static PyObject *
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2293 object_new(PyTypeObject type, PyObject args, PyObject *kwds)
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2294 {
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2295 if (type->tp_init == object_init && (PyTuple_GET_SIZE(args) \|\|
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2296 (kwds && PyDict_Check(kwds) && PyDict_Size(kwds)))) {
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2297 PyErr_SetString(PyExc_TypeError,
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2298 "default __new__ takes no parameters");
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2299 return NULL;
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2300 }
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2301 return type->tp_alloc(type, 0);
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2302 }
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2303
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2304 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2305 object_dealloc(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2306 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2307 self->ob_type->tp_free(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2308 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2309
19194 7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2310 static PyObject *
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2311 object_repr(PyObject *self)
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2312 {
19316 f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2313 PyTypeObject *type;
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2314 PyObject mod, name, *rtn;
19194 7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2315
19316 f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2316 type = self->ob_type;
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2317 mod = type_module(type, NULL);
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2318 if (mod == NULL)
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2319 PyErr_Clear();
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2320 else if (!PyString_Check(mod)) {
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2321 Py_DECREF(mod);
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2322 mod = NULL;
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2323 }
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2324 name = type_name(type, NULL);
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2325 if (name == NULL)
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2326 return NULL;
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2327 if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__"))
20056 33edc99861b9 Fix the baffler that Tim reported: sometimes the repr() of an object Guido van Rossum <guido@python.org> parents: 20028 diff changeset	2328 rtn = PyString_FromFormat("<%s.%s object at %p>",
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2329 PyString_AS_STRING(mod),
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2330 PyString_AS_STRING(name),
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2331 self);
19316 f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2332 else
20056 33edc99861b9 Fix the baffler that Tim reported: sometimes the repr() of an object Guido van Rossum <guido@python.org> parents: 20028 diff changeset	2333 rtn = PyString_FromFormat("<%s object at %p>",
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2334 type->tp_name, self);
19316 f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2335 Py_XDECREF(mod);
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2336 Py_DECREF(name);
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2337 return rtn;
19194 7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2338 }
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2339
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2340 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2341 object_str(PyObject *self)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2342 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2343 unaryfunc f;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2344
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2345 f = self->ob_type->tp_repr;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2346 if (f == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2347 f = object_repr;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2348 return f(self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2349 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2350
19194 7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2351 static long
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2352 object_hash(PyObject *self)
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2353 {
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2354 return _Py_HashPointer(self);
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2355 }
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2356
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2357 static PyObject *
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2358 object_get_class(PyObject self, void closure)
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2359 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2360 Py_INCREF(self->ob_type);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2361 return (PyObject *)(self->ob_type);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2362 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2363
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2364 static int
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2365 equiv_structs(PyTypeObject a, PyTypeObject b)
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2366 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2367 return a == b \|\|
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2368 (a != NULL &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2369 b != NULL &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2370 a->tp_basicsize == b->tp_basicsize &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2371 a->tp_itemsize == b->tp_itemsize &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2372 a->tp_dictoffset == b->tp_dictoffset &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2373 a->tp_weaklistoffset == b->tp_weaklistoffset &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2374 ((a->tp_flags & Py_TPFLAGS_HAVE_GC) ==
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2375 (b->tp_flags & Py_TPFLAGS_HAVE_GC)));
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2376 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2377
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2378 static int
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2379 same_slots_added(PyTypeObject a, PyTypeObject b)
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2380 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2381 PyTypeObject *base = a->tp_base;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2382 int size;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2383
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2384 if (base != b->tp_base)
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2385 return 0;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2386 if (equiv_structs(a, base) && equiv_structs(b, base))
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2387 return 1;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2388 size = base->tp_basicsize;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2389 if (a->tp_dictoffset == size && b->tp_dictoffset == size)
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2390 size += sizeof(PyObject *);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2391 if (a->tp_weaklistoffset == size && b->tp_weaklistoffset == size)
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2392 size += sizeof(PyObject *);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2393 return size == a->tp_basicsize && size == b->tp_basicsize;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2394 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2395
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2396 static int
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2397 compatible_for_assignment(PyTypeObject* old, PyTypeObject* new, char* attr)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2398 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2399 PyTypeObject newbase, oldbase;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2400
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2401 if (new->tp_dealloc != old->tp_dealloc \|\|
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2402 new->tp_free != old->tp_free)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2403 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2404 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2405 "%s assignment: "
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2406 "'%s' deallocator differs from '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2407 attr,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2408 new->tp_name,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2409 old->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2410 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2411 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2412 newbase = new;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2413 oldbase = old;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2414 while (equiv_structs(newbase, newbase->tp_base))
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2415 newbase = newbase->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2416 while (equiv_structs(oldbase, oldbase->tp_base))
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2417 oldbase = oldbase->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2418 if (newbase != oldbase &&
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2419 (newbase->tp_base != oldbase->tp_base \|\|
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2420 !same_slots_added(newbase, oldbase))) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2421 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2422 "%s assignment: "
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2423 "'%s' object layout differs from '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2424 attr,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2425 new->tp_name,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2426 old->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2427 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2428 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	2429
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2430 return 1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2431 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2432
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2433 static int
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2434 object_set_class(PyObject self, PyObject value, void *closure)
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2435 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2436 PyTypeObject *old = self->ob_type;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2437 PyTypeObject *new;
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2438
23037 89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2439 if (value == NULL) {
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2440 PyErr_SetString(PyExc_TypeError,
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2441 "can't delete __class__ attribute");
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2442 return -1;
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2443 }
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2444 if (!PyType_Check(value)) {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2445 PyErr_Format(PyExc_TypeError,
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2446 "__class__ must be set to new-style class, not '%s' object",
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2447 value->ob_type->tp_name);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2448 return -1;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2449 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2450 new = (PyTypeObject *)value;
24728 3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2451 if (!(new->tp_flags & Py_TPFLAGS_HEAPTYPE) \|\|
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2452 !(old->tp_flags & Py_TPFLAGS_HEAPTYPE))
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2453 {
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2454 PyErr_Format(PyExc_TypeError,
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2455 "__class__ assignment: only for heap types");
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2456 return -1;
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2457 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2458 if (compatible_for_assignment(new, old, "__class__")) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2459 Py_INCREF(new);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2460 self->ob_type = new;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2461 Py_DECREF(old);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2462 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2463 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2464 else {
23541 f6ded6efabcf Add a safeguard against setting the class to something with a Guido van Rossum <guido@python.org> parents: 23127 diff changeset	2465 return -1;
f6ded6efabcf Add a safeguard against setting the class to something with a Guido van Rossum <guido@python.org> parents: 23127 diff changeset	2466 }
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2467 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2468
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2469 static PyGetSetDef object_getsets[] = {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2470 {"__class__", object_get_class, object_set_class,
24785 4de9ac0e4173 Allow docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24762 diff changeset	2471 PyDoc_STR("the object's class")},
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2472 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2473 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2474
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2475
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2476 /* Stuff to implement __reduce_ex__ for pickle protocols >= 2.
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2477 We fall back to helpers in copy_reg for:
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2478 - pickle protocols < 2
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2479 - calculating the list of slot names (done only once per class)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2480 - the __newobj__ function (which is used as a token but never called)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2481 */
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2482
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2483 static PyObject *
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2484 import_copy_reg(void)
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2485 {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2486 static PyObject *copy_reg_str;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2487
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2488 if (!copy_reg_str) {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2489 copy_reg_str = PyString_InternFromString("copy_reg");
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2490 if (copy_reg_str == NULL)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2491 return NULL;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2492 }
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2493
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2494 return PyImport_Import(copy_reg_str);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2495 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2496
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2497 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2498 slotnames(PyObject *cls)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2499 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2500 PyObject *clsdict;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2501 PyObject *copy_reg;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2502 PyObject *slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2503
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2504 if (!PyType_Check(cls)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2505 Py_INCREF(Py_None);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2506 return Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2507 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2508
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2509 clsdict = ((PyTypeObject *)cls)->tp_dict;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2510 slotnames = PyDict_GetItemString(clsdict, "__slotnames__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2511 if (slotnames != NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2512 Py_INCREF(slotnames);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2513 return slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2514 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2515
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2516 copy_reg = import_copy_reg();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2517 if (copy_reg == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2518 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2519
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2520 slotnames = PyObject_CallMethod(copy_reg, "_slotnames", "O", cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2521 Py_DECREF(copy_reg);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2522 if (slotnames != NULL &&
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2523 slotnames != Py_None &&
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2524 !PyList_Check(slotnames))
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2525 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2526 PyErr_SetString(PyExc_TypeError,
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2527 "copy_reg._slotnames didn't return a list or None");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2528 Py_DECREF(slotnames);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2529 slotnames = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2530 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2531
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2532 return slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2533 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2534
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2535 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2536 reduce_2(PyObject *obj)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2537 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2538 PyObject cls, getnewargs;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2539 PyObject args = NULL, args2 = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2540 PyObject getstate = NULL, state = NULL, *names = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2541 PyObject slots = NULL, listitems = NULL, *dictitems = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2542 PyObject copy_reg = NULL, newobj = NULL, *res = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2543 int i, n;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2544
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2545 cls = PyObject_GetAttrString(obj, "__class__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2546 if (cls == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2547 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2548
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2549 getnewargs = PyObject_GetAttrString(obj, "__getnewargs__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2550 if (getnewargs != NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2551 args = PyObject_CallObject(getnewargs, NULL);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2552 Py_DECREF(getnewargs);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2553 if (args != NULL && !PyTuple_Check(args)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2554 PyErr_SetString(PyExc_TypeError,
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2555 "__getnewargs__ should return a tuple");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2556 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2557 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2558 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2559 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2560 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2561 args = PyTuple_New(0);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2562 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2563 if (args == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2564 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2565
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2566 getstate = PyObject_GetAttrString(obj, "__getstate__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2567 if (getstate != NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2568 state = PyObject_CallObject(getstate, NULL);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2569 Py_DECREF(getstate);
29382 585e303a9491 Fix SF #749831, copy raises SystemError when getstate raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 29308 diff changeset	2570 if (state == NULL)
585e303a9491 Fix SF #749831, copy raises SystemError when getstate raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 29308 diff changeset	2571 goto end;
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2572 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2573 else {
31494 6a8e8a13c745 Fixed a bug in object.__reduce_ex__ (reduce_2) when using protocol Jim Fulton <jim@zope.com> parents: 30916 diff changeset	2574 PyErr_Clear();
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2575 state = PyObject_GetAttrString(obj, "__dict__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2576 if (state == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2577 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2578 state = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2579 Py_INCREF(state);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2580 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2581 names = slotnames(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2582 if (names == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2583 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2584 if (names != Py_None) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2585 assert(PyList_Check(names));
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2586 slots = PyDict_New();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2587 if (slots == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2588 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2589 n = 0;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2590 /* Can't pre-compute the list size; the list
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2591 is stored on the class so accessible to other
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2592 threads, which may be run by DECREF */
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2593 for (i = 0; i < PyList_GET_SIZE(names); i++) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2594 PyObject name, value;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2595 name = PyList_GET_ITEM(names, i);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2596 value = PyObject_GetAttr(obj, name);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2597 if (value == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2598 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2599 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2600 int err = PyDict_SetItem(slots, name,
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2601 value);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2602 Py_DECREF(value);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2603 if (err)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2604 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2605 n++;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2606 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2607 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2608 if (n) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2609 state = Py_BuildValue("(NO)", state, slots);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2610 if (state == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2611 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2612 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2613 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2614 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2615
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2616 if (!PyList_Check(obj)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2617 listitems = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2618 Py_INCREF(listitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2619 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2620 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2621 listitems = PyObject_GetIter(obj);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2622 if (listitems == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2623 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2624 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2625
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2626 if (!PyDict_Check(obj)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2627 dictitems = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2628 Py_INCREF(dictitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2629 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2630 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2631 dictitems = PyObject_CallMethod(obj, "iteritems", "");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2632 if (dictitems == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2633 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2634 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2635
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2636 copy_reg = import_copy_reg();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2637 if (copy_reg == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2638 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2639 newobj = PyObject_GetAttrString(copy_reg, "__newobj__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2640 if (newobj == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2641 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2642
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2643 n = PyTuple_GET_SIZE(args);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2644 args2 = PyTuple_New(n+1);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2645 if (args2 == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2646 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2647 PyTuple_SET_ITEM(args2, 0, cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2648 cls = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2649 for (i = 0; i < n; i++) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2650 PyObject *v = PyTuple_GET_ITEM(args, i);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2651 Py_INCREF(v);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2652 PyTuple_SET_ITEM(args2, i+1, v);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2653 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2654
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2655 res = Py_BuildValue("(OOOOO)",
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2656 newobj, args2, state, listitems, dictitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2657
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2658 end:
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2659 Py_XDECREF(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2660 Py_XDECREF(args);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2661 Py_XDECREF(args2);
28566 9ddc498b7013 Missing DECREF. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28514 diff changeset	2662 Py_XDECREF(slots);
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2663 Py_XDECREF(state);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2664 Py_XDECREF(names);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2665 Py_XDECREF(listitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2666 Py_XDECREF(dictitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2667 Py_XDECREF(copy_reg);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2668 Py_XDECREF(newobj);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2669 return res;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2670 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2671
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2672 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2673 object_reduce_ex(PyObject self, PyObject args)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2674 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2675 /* Call copy_reg._reduce_ex(self, proto) */
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2676 PyObject reduce, copy_reg, *res;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2677 int proto = 0;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2678
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2679 if (!PyArg_ParseTuple(args, "\|i:__reduce_ex__", &proto))
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2680 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2681
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2682 reduce = PyObject_GetAttrString(self, "__reduce__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2683 if (reduce == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2684 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2685 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2686 PyObject cls, clsreduce, *objreduce;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2687 int override;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2688 cls = PyObject_GetAttrString(self, "__class__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2689 if (cls == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2690 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2691 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2692 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2693 clsreduce = PyObject_GetAttrString(cls, "__reduce__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2694 Py_DECREF(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2695 if (clsreduce == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2696 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2697 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2698 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2699 objreduce = PyDict_GetItemString(PyBaseObject_Type.tp_dict,
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2700 "__reduce__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2701 override = (clsreduce != objreduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2702 Py_DECREF(clsreduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2703 if (override) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2704 res = PyObject_CallObject(reduce, NULL);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2705 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2706 return res;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2707 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2708 else
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2709 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2710 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2711
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2712 if (proto >= 2)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2713 return reduce_2(self);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2714
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2715 copy_reg = import_copy_reg();
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2716 if (!copy_reg)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2717 return NULL;
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2718
27948 db1d4584a5e1 Introducing __reduce_ex__, which is called with a protocol number argument Guido van Rossum <guido@python.org> parents: 27943 diff changeset	2719 res = PyEval_CallMethod(copy_reg, "_reduce_ex", "(Oi)", self, proto);
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2720 Py_DECREF(copy_reg);
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2721
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2722 return res;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2723 }
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2724
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2725 static PyMethodDef object_methods[] = {
27948 db1d4584a5e1 Introducing __reduce_ex__, which is called with a protocol number argument Guido van Rossum <guido@python.org> parents: 27943 diff changeset	2726 {"__reduce_ex__", object_reduce_ex, METH_VARARGS,
db1d4584a5e1 Introducing __reduce_ex__, which is called with a protocol number argument Guido van Rossum <guido@python.org> parents: 27943 diff changeset	2727 PyDoc_STR("helper for pickle")},
db1d4584a5e1 Introducing __reduce_ex__, which is called with a protocol number argument Guido van Rossum <guido@python.org> parents: 27943 diff changeset	2728 {"__reduce__", object_reduce_ex, METH_VARARGS,
24795 452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	2729 PyDoc_STR("helper for pickle")},
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2730 {0}
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2731 };
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2732
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2733
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2734 PyTypeObject PyBaseObject_Type = {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2735 PyObject_HEAD_INIT(&PyType_Type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2736 0, /* ob_size */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2737 "object", /* tp_name */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2738 sizeof(PyObject), /* tp_basicsize */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2739 0, /* tp_itemsize */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2740 (destructor)object_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2741 0, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2742 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2743 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2744 0, /* tp_compare */
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2745 object_repr, /* tp_repr */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2746 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2747 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2748 0, /* tp_as_mapping */
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2749 object_hash, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2750 0, /* tp_call */
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2751 object_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2752 PyObject_GenericGetAttr, /* tp_getattro */
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2753 PyObject_GenericSetAttr, /* tp_setattro */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2754 0, /* tp_as_buffer */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2755 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
24795 452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	2756 PyDoc_STR("The most base type"), /* tp_doc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2757 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2758 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2759 0, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2760 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2761 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2762 0, /* tp_iternext */
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2763 object_methods, /* tp_methods */
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2764 0, /* tp_members */
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2765 object_getsets, /* tp_getset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2766 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2767 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2768 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2769 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2770 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2771 object_init, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2772 PyType_GenericAlloc, /* tp_alloc */
27866 bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2773 object_new, /* tp_new */
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	2774 PyObject_Del, /* tp_free */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2775 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2776
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2777
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2778 /* Initialize the __dict__ in a type object */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2779
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2780 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2781 add_methods(PyTypeObject type, PyMethodDef meth)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2782 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2783 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2784
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2785 for (; meth->ml_name != NULL; meth++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2786 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2787 if (PyDict_GetItemString(dict, meth->ml_name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2788 continue;
22613 ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2789 if (meth->ml_flags & METH_CLASS) {
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2790 if (meth->ml_flags & METH_STATIC) {
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2791 PyErr_SetString(PyExc_ValueError,
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2792 "method cannot be both class and static");
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2793 return -1;
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2794 }
26583 8991f78817c7 SF 548651: Fix the METH_CLASS implementation. Tim Peters <tim.peters@gmail.com> parents: 26575 diff changeset	2795 descr = PyDescr_NewClassMethod(type, meth);
22613 ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2796 }
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2797 else if (meth->ml_flags & METH_STATIC) {
27814 48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2798 PyObject *cfunc = PyCFunction_New(meth, NULL);
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2799 if (cfunc == NULL)
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2800 return -1;
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2801 descr = PyStaticMethod_New(cfunc);
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2802 Py_DECREF(cfunc);
22613 ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2803 }
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2804 else {
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2805 descr = PyDescr_NewMethod(type, meth);
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2806 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2807 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2808 return -1;
22613 ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2809 if (PyDict_SetItemString(dict, meth->ml_name, descr) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2810 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2811 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2812 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2813 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2814 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2815
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2816 static int
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	2817 add_members(PyTypeObject type, PyMemberDef memb)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2818 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2819 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2820
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2821 for (; memb->name != NULL; memb++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2822 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2823 if (PyDict_GetItemString(dict, memb->name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2824 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2825 descr = PyDescr_NewMember(type, memb);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2826 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2827 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2828 if (PyDict_SetItemString(dict, memb->name, descr) < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2829 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2830 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2831 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2832 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2833 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2834
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2835 static int
20015 ca7af2a5d915 Add optional docstrings to getset descriptors. Fortunately, there's Guido van Rossum <guido@python.org> parents: 20012 diff changeset	2836 add_getset(PyTypeObject type, PyGetSetDef gsp)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2837 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2838 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2839
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2840 for (; gsp->name != NULL; gsp++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2841 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2842 if (PyDict_GetItemString(dict, gsp->name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2843 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2844 descr = PyDescr_NewGetSet(type, gsp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2845
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2846 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2847 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2848 if (PyDict_SetItemString(dict, gsp->name, descr) < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2849 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2850 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2851 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2852 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2853 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2854
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2855 static void
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2856 inherit_special(PyTypeObject type, PyTypeObject base)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2857 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2858 int oldsize, newsize;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2859
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2860 /* Special flag magic */
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2861 if (!type->tp_as_buffer && base->tp_as_buffer) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2862 type->tp_flags &= ~Py_TPFLAGS_HAVE_GETCHARBUFFER;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2863 type->tp_flags \|=
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2864 base->tp_flags & Py_TPFLAGS_HAVE_GETCHARBUFFER;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2865 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2866 if (!type->tp_as_sequence && base->tp_as_sequence) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2867 type->tp_flags &= ~Py_TPFLAGS_HAVE_SEQUENCE_IN;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2868 type->tp_flags \|= base->tp_flags & Py_TPFLAGS_HAVE_SEQUENCE_IN;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2869 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2870 if ((type->tp_flags & Py_TPFLAGS_HAVE_INPLACEOPS) !=
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2871 (base->tp_flags & Py_TPFLAGS_HAVE_INPLACEOPS)) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2872 if ((!type->tp_as_number && base->tp_as_number) \|\|
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2873 (!type->tp_as_sequence && base->tp_as_sequence)) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2874 type->tp_flags &= ~Py_TPFLAGS_HAVE_INPLACEOPS;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2875 if (!type->tp_as_number && !type->tp_as_sequence) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2876 type->tp_flags \|= base->tp_flags &
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2877 Py_TPFLAGS_HAVE_INPLACEOPS;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2878 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2879 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2880 /* Wow */
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2881 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2882 if (!type->tp_as_number && base->tp_as_number) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2883 type->tp_flags &= ~Py_TPFLAGS_CHECKTYPES;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2884 type->tp_flags \|= base->tp_flags & Py_TPFLAGS_CHECKTYPES;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2885 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2886
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2887 /* Copying basicsize is connected to the GC flags */
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2888 oldsize = base->tp_basicsize;
13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2889 newsize = type->tp_basicsize ? type->tp_basicsize : oldsize;
13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2890 if (!(type->tp_flags & Py_TPFLAGS_HAVE_GC) &&
13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2891 (base->tp_flags & Py_TPFLAGS_HAVE_GC) &&
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2892 (type->tp_flags & Py_TPFLAGS_HAVE_RICHCOMPARE/GC slots exist/) &&
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2893 (!type->tp_traverse && !type->tp_clear)) {
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2894 type->tp_flags \|= Py_TPFLAGS_HAVE_GC;
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2895 if (type->tp_traverse == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2896 type->tp_traverse = base->tp_traverse;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2897 if (type->tp_clear == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2898 type->tp_clear = base->tp_clear;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2899 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2900 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_CLASS) {
21451 be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2901 /* The condition below could use some explanation.
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2902 It appears that tp_new is not inherited for static types
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2903 whose base class is 'object'; this seems to be a precaution
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2904 so that old extension types don't suddenly become
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2905 callable (object.__new__ wouldn't insure the invariants
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2906 that the extension type's own factory function ensures).
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2907 Heap types, of course, are under our control, so they do
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2908 inherit tp_new; static extension types that specify some
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2909 other built-in type as the default are considered
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	2910 new-style-aware so they also inherit object.__new__. */
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2911 if (base != &PyBaseObject_Type \|\|
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2912 (type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2913 if (type->tp_new == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2914 type->tp_new = base->tp_new;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2915 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2916 }
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2917 type->tp_basicsize = newsize;
19253 968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2918
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2919 /* Copy other non-function slots */
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2920
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2921 #undef COPYVAL
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2922 #define COPYVAL(SLOT) \
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2923 if (type->SLOT == 0) type->SLOT = base->SLOT
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2924
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2925 COPYVAL(tp_itemsize);
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2926 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_WEAKREFS) {
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2927 COPYVAL(tp_weaklistoffset);
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2928 }
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2929 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_CLASS) {
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2930 COPYVAL(tp_dictoffset);
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2931 }
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2932 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2933
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2934 static void
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2935 inherit_slots(PyTypeObject type, PyTypeObject base)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2936 {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2937 PyTypeObject *basebase;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2938
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2939 #undef SLOTDEFINED
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2940 #undef COPYSLOT
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2941 #undef COPYNUM
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2942 #undef COPYSEQ
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2943 #undef COPYMAP
20386 3c01c34d07f6 Now that COPYBUF is a new local macro, add #undef COPYBUF. Guido van Rossum <guido@python.org> parents: 20384 diff changeset	2944 #undef COPYBUF
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2945
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2946 #define SLOTDEFINED(SLOT) \
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2947 (base->SLOT != 0 && \
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2948 (basebase == NULL \|\| base->SLOT != basebase->SLOT))
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2949
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2950 #define COPYSLOT(SLOT) \
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2951 if (!type->SLOT && SLOTDEFINED(SLOT)) type->SLOT = base->SLOT
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2952
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2953 #define COPYNUM(SLOT) COPYSLOT(tp_as_number->SLOT)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2954 #define COPYSEQ(SLOT) COPYSLOT(tp_as_sequence->SLOT)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2955 #define COPYMAP(SLOT) COPYSLOT(tp_as_mapping->SLOT)
20384 2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2956 #define COPYBUF(SLOT) COPYSLOT(tp_as_buffer->SLOT)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2957
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2958 /* This won't inherit indirect slots (from tp_as_number etc.)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2959 if type doesn't provide the space. */
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2960
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2961 if (type->tp_as_number != NULL && base->tp_as_number != NULL) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2962 basebase = base->tp_base;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2963 if (basebase->tp_as_number == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2964 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2965 COPYNUM(nb_add);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2966 COPYNUM(nb_subtract);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2967 COPYNUM(nb_multiply);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2968 COPYNUM(nb_divide);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2969 COPYNUM(nb_remainder);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2970 COPYNUM(nb_divmod);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2971 COPYNUM(nb_power);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2972 COPYNUM(nb_negative);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2973 COPYNUM(nb_positive);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2974 COPYNUM(nb_absolute);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2975 COPYNUM(nb_nonzero);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2976 COPYNUM(nb_invert);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2977 COPYNUM(nb_lshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2978 COPYNUM(nb_rshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2979 COPYNUM(nb_and);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2980 COPYNUM(nb_xor);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2981 COPYNUM(nb_or);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2982 COPYNUM(nb_coerce);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2983 COPYNUM(nb_int);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2984 COPYNUM(nb_long);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2985 COPYNUM(nb_float);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2986 COPYNUM(nb_oct);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2987 COPYNUM(nb_hex);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2988 COPYNUM(nb_inplace_add);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2989 COPYNUM(nb_inplace_subtract);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2990 COPYNUM(nb_inplace_multiply);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2991 COPYNUM(nb_inplace_divide);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2992 COPYNUM(nb_inplace_remainder);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2993 COPYNUM(nb_inplace_power);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2994 COPYNUM(nb_inplace_lshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2995 COPYNUM(nb_inplace_rshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2996 COPYNUM(nb_inplace_and);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2997 COPYNUM(nb_inplace_xor);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2998 COPYNUM(nb_inplace_or);
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2999 if (base->tp_flags & Py_TPFLAGS_CHECKTYPES) {
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3000 COPYNUM(nb_true_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3001 COPYNUM(nb_floor_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3002 COPYNUM(nb_inplace_true_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3003 COPYNUM(nb_inplace_floor_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3004 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3005 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3006
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3007 if (type->tp_as_sequence != NULL && base->tp_as_sequence != NULL) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3008 basebase = base->tp_base;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3009 if (basebase->tp_as_sequence == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3010 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3011 COPYSEQ(sq_length);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3012 COPYSEQ(sq_concat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3013 COPYSEQ(sq_repeat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3014 COPYSEQ(sq_item);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3015 COPYSEQ(sq_slice);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3016 COPYSEQ(sq_ass_item);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3017 COPYSEQ(sq_ass_slice);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3018 COPYSEQ(sq_contains);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3019 COPYSEQ(sq_inplace_concat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3020 COPYSEQ(sq_inplace_repeat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3021 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3022
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3023 if (type->tp_as_mapping != NULL && base->tp_as_mapping != NULL) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3024 basebase = base->tp_base;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3025 if (basebase->tp_as_mapping == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3026 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3027 COPYMAP(mp_length);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3028 COPYMAP(mp_subscript);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3029 COPYMAP(mp_ass_subscript);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3030 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3031
20384 2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3032 if (type->tp_as_buffer != NULL && base->tp_as_buffer != NULL) {
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3033 basebase = base->tp_base;
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3034 if (basebase->tp_as_buffer == NULL)
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3035 basebase = NULL;
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3036 COPYBUF(bf_getreadbuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3037 COPYBUF(bf_getwritebuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3038 COPYBUF(bf_getsegcount);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3039 COPYBUF(bf_getcharbuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3040 }
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3041
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3042 basebase = base->tp_base;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3043
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3044 COPYSLOT(tp_dealloc);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3045 COPYSLOT(tp_print);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3046 if (type->tp_getattr == NULL && type->tp_getattro == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3047 type->tp_getattr = base->tp_getattr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3048 type->tp_getattro = base->tp_getattro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3049 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3050 if (type->tp_setattr == NULL && type->tp_setattro == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3051 type->tp_setattr = base->tp_setattr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3052 type->tp_setattro = base->tp_setattro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3053 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3054 /* tp_compare see tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3055 COPYSLOT(tp_repr);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3056 /* tp_hash see tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3057 COPYSLOT(tp_call);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3058 COPYSLOT(tp_str);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3059 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_RICHCOMPARE) {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3060 if (type->tp_compare == NULL &&
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3061 type->tp_richcompare == NULL &&
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3062 type->tp_hash == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3063 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3064 type->tp_compare = base->tp_compare;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3065 type->tp_richcompare = base->tp_richcompare;
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3066 type->tp_hash = base->tp_hash;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3067 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3068 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3069 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3070 COPYSLOT(tp_compare);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3071 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3072 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_ITER) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3073 COPYSLOT(tp_iter);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3074 COPYSLOT(tp_iternext);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3075 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3076 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_CLASS) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3077 COPYSLOT(tp_descr_get);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3078 COPYSLOT(tp_descr_set);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3079 COPYSLOT(tp_dictoffset);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3080 COPYSLOT(tp_init);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3081 COPYSLOT(tp_alloc);
22848 e589e473f232 Inherit tp_new and tp_is_gc. Guido van Rossum <guido@python.org> parents: 22834 diff changeset	3082 COPYSLOT(tp_is_gc);
29201 754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3083 if ((type->tp_flags & Py_TPFLAGS_HAVE_GC) ==
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3084 (base->tp_flags & Py_TPFLAGS_HAVE_GC)) {
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3085 /* They agree about gc. */
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3086 COPYSLOT(tp_free);
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3087 }
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3088 else if ((type->tp_flags & Py_TPFLAGS_HAVE_GC) &&
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3089 type->tp_free == NULL &&
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3090 base->tp_free == _PyObject_Del) {
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3091 /* A bit of magic to plug in the correct default
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3092 * tp_free function when a derived class adds gc,
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3093 * didn't define tp_free, and the base uses the
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3094 * default non-gc tp_free.
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3095 */
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3096 type->tp_free = PyObject_GC_Del;
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3097 }
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3098 /* else they didn't agree about gc, and there isn't something
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3099 * obvious to be done -- the type is on its own.
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3100 */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3101 }
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3102 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3103
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	3104 static int add_operators(PyTypeObject *);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3105
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3106 int
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	3107 PyType_Ready(PyTypeObject *type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3108 {
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3109 PyObject dict, bases;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3110 PyTypeObject *base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3111 int i, n;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3112
23756 8e5f26796620 Undo the last chunk of the previous patch, putting back a useful Guido van Rossum <guido@python.org> parents: 23755 diff changeset	3113 if (type->tp_flags & Py_TPFLAGS_READY) {
8e5f26796620 Undo the last chunk of the previous patch, putting back a useful Guido van Rossum <guido@python.org> parents: 23755 diff changeset	3114 assert(type->tp_dict != NULL);
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3115 return 0;
23756 8e5f26796620 Undo the last chunk of the previous patch, putting back a useful Guido van Rossum <guido@python.org> parents: 23755 diff changeset	3116 }
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3117 assert((type->tp_flags & Py_TPFLAGS_READYING) == 0);
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3118
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3119 type->tp_flags \|= Py_TPFLAGS_READYING;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3120
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3121 #ifdef Py_TRACE_REFS
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3122 /* PyType_Ready is the closest thing we have to a choke point
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3123 * for type objects, so is the best place I can think of to try
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3124 * to get type objects into the doubly-linked list of all objects.
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3125 * Still, not all type objects go thru PyType_Ready.
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3126 */
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28390 diff changeset	3127 _Py_AddToAllObjects((PyObject *)type, 0);
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3128 #endif
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3129
22871 252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3130 /* Initialize tp_base (defaults to BaseObject unless that's us) */
252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3131 base = type->tp_base;
252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3132 if (base == NULL && type != &PyBaseObject_Type)
252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3133 base = type->tp_base = &PyBaseObject_Type;
252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3134
24825 c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3135 /* Initialize the base class */
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3136 if (base && base->tp_dict == NULL) {
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3137 if (PyType_Ready(base) < 0)
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3138 goto error;
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3139 }
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3140
21451 be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	3141 /* Initialize ob_type if NULL. This means extensions that want to be
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	3142 compilable separately on Windows can call PyType_Ready() instead of
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	3143 initializing the ob_type field of their type objects. */
be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	3144 if (type->ob_type == NULL)
22871 252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3145 type->ob_type = base->ob_type;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3146
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3147 /* Initialize tp_bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3148 bases = type->tp_bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3149 if (bases == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3150 if (base == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3151 bases = PyTuple_New(0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3152 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3153 bases = Py_BuildValue("(O)", base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3154 if (bases == NULL)
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3155 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3156 type->tp_bases = bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3157 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3158
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3159 /* Initialize tp_dict */
27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3160 dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3161 if (dict == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3162 dict = PyDict_New();
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3163 if (dict == NULL)
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3164 goto error;
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3165 type->tp_dict = dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3166 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3167
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3168 /* Add type-specific descriptors to tp_dict */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3169 if (add_operators(type) < 0)
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3170 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3171 if (type->tp_methods != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3172 if (add_methods(type, type->tp_methods) < 0)
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3173 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3174 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3175 if (type->tp_members != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3176 if (add_members(type, type->tp_members) < 0)
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3177 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3178 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3179 if (type->tp_getset != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3180 if (add_getset(type, type->tp_getset) < 0)
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3181 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3182 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3183
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3184 /* Calculate method resolution order */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3185 if (mro_internal(type) < 0) {
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3186 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3187 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3188
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3189 /* Inherit special flags from dominant base */
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3190 if (type->tp_base != NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3191 inherit_special(type, type->tp_base);
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3192
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3193 /* Initialize tp_dict properly */
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3194 bases = type->tp_mro;
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3195 assert(bases != NULL);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3196 assert(PyTuple_Check(bases));
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3197 n = PyTuple_GET_SIZE(bases);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3198 for (i = 1; i < n; i++) {
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	3199 PyObject *b = PyTuple_GET_ITEM(bases, i);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	3200 if (PyType_Check(b))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	3201 inherit_slots(type, (PyTypeObject *)b);
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3202 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3203
29201 754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3204 /* Sanity check for tp_free. */
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3205 if (PyType_IS_GC(type) && (type->tp_flags & Py_TPFLAGS_BASETYPE) &&
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3206 (type->tp_free == NULL \|\| type->tp_free == PyObject_Del)) {
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3207 /* This base class needs to call tp_free, but doesn't have
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3208 * one, or its tp_free is for non-gc'ed objects.
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3209 */
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3210 PyErr_Format(PyExc_TypeError, "type '%.100s' participates in "
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3211 "gc and is a base type but has inappropriate "
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3212 "tp_free slot",
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3213 type->tp_name);
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3214 goto error;
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3215 }
754fd34ad978 PyType_Ready(): Complain if the type is a base type, and gc'able, and Tim Peters <tim.peters@gmail.com> parents: 29173 diff changeset	3216
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3217 /* if the type dictionary doesn't contain a __doc__, set it from
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3218 the tp_doc slot.
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3219 */
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3220 if (PyDict_GetItemString(type->tp_dict, "__doc__") == NULL) {
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3221 if (type->tp_doc != NULL) {
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3222 PyObject *doc = PyString_FromString(type->tp_doc);
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3223 PyDict_SetItemString(type->tp_dict, "__doc__", doc);
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3224 Py_DECREF(doc);
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3225 } else {
22774 02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	3226 PyDict_SetItemString(type->tp_dict,
02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	3227 "__doc__", Py_None);
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3228 }
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3229 }
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3230
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3231 /* Some more special stuff */
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3232 base = type->tp_base;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3233 if (base != NULL) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3234 if (type->tp_as_number == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3235 type->tp_as_number = base->tp_as_number;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3236 if (type->tp_as_sequence == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3237 type->tp_as_sequence = base->tp_as_sequence;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3238 if (type->tp_as_mapping == NULL)
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3239 type->tp_as_mapping = base->tp_as_mapping;
27821 b804ee5beb49 Fix from SF #681367: inherit tp_as_buffer. This only applies to C Guido van Rossum <guido@python.org> parents: 27814 diff changeset	3240 if (type->tp_as_buffer == NULL)
b804ee5beb49 Fix from SF #681367: inherit tp_as_buffer. This only applies to C Guido van Rossum <guido@python.org> parents: 27814 diff changeset	3241 type->tp_as_buffer = base->tp_as_buffer;
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3242 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3243
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3244 /* Link into each base class's list of subclasses */
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3245 bases = type->tp_bases;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3246 n = PyTuple_GET_SIZE(bases);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3247 for (i = 0; i < n; i++) {
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	3248 PyObject *b = PyTuple_GET_ITEM(bases, i);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	3249 if (PyType_Check(b) &&
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	3250 add_subclass((PyTypeObject *)b, type) < 0)
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3251 goto error;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3252 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3253
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3254 /* All done -- set the ready flag */
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3255 assert(type->tp_dict != NULL);
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3256 type->tp_flags =
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3257 (type->tp_flags & ~Py_TPFLAGS_READYING) \| Py_TPFLAGS_READY;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3258 return 0;
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3259
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3260 error:
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3261 type->tp_flags &= ~Py_TPFLAGS_READYING;
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3262 return -1;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3263 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3264
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3265 static int
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3266 add_subclass(PyTypeObject base, PyTypeObject type)
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3267 {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3268 int i;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3269 PyObject list, ref, *new;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3270
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3271 list = base->tp_subclasses;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3272 if (list == NULL) {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3273 base->tp_subclasses = list = PyList_New(0);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3274 if (list == NULL)
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3275 return -1;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3276 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3277 assert(PyList_Check(list));
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3278 new = PyWeakref_NewRef((PyObject *)type, NULL);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3279 i = PyList_GET_SIZE(list);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3280 while (--i >= 0) {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3281 ref = PyList_GET_ITEM(list, i);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3282 assert(PyWeakref_CheckRef(ref));
25839 243503926c81 Sigh. That wasn't a memory leak, that was Guido committing before Guido van Rossum <guido@python.org> parents: 25837 diff changeset	3283 if (PyWeakref_GET_OBJECT(ref) == Py_None)
243503926c81 Sigh. That wasn't a memory leak, that was Guido committing before Guido van Rossum <guido@python.org> parents: 25837 diff changeset	3284 return PyList_SetItem(list, i, new);
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3285 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3286 i = PyList_Append(list, new);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3287 Py_DECREF(new);
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3288 return i;
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3289 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3290
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3291 static void
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3292 remove_subclass(PyTypeObject base, PyTypeObject type)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3293 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3294 int i;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3295 PyObject list, ref;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3296
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3297 list = base->tp_subclasses;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3298 if (list == NULL) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3299 return;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3300 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3301 assert(PyList_Check(list));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3302 i = PyList_GET_SIZE(list);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3303 while (--i >= 0) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3304 ref = PyList_GET_ITEM(list, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3305 assert(PyWeakref_CheckRef(ref));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3306 if (PyWeakref_GET_OBJECT(ref) == (PyObject*)type) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3307 /* this can't fail, right? */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3308 PySequence_DelItem(list, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3309 return;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3310 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3311 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3312 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3313
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3314 /* Generic wrappers for overloadable 'operators' such as __getitem__ */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3315
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3316 /* There's a wrapper function for each distinct function typedef used
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3317 for type object slots (e.g. binaryfunc, ternaryfunc, etc.). There's a
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3318 wrapper table for each distinct operation (e.g. __len__, __add__).
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3319 Most tables have only one entry; the tables for binary operators have two
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3320 entries, one regular and one with reversed arguments. */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3321
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3322 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3323 wrap_inquiry(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3324 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3325 inquiry func = (inquiry)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3326 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3327
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3328 if (!PyArg_ParseTuple(args, ""))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3329 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3330 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3331 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3332 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3333 return PyInt_FromLong((long)res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3334 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3335
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3336 static PyObject *
30685 6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3337 wrap_inquirypred(PyObject self, PyObject args, void *wrapped)
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3338 {
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3339 inquiry func = (inquiry)wrapped;
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3340 int res;
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3341
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3342 if (!PyArg_ParseTuple(args, ""))
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3343 return NULL;
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3344 res = (*func)(self);
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3345 if (res == -1 && PyErr_Occurred())
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3346 return NULL;
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3347 return PyBool_FromLong((long)res);
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3348 }
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3349
6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	3350 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3351 wrap_binaryfunc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3352 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3353 binaryfunc func = (binaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3354 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3355
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3356 if (!PyArg_ParseTuple(args, "O", &other))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3357 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3358 return (*func)(self, other);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3359 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3360
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3361 static PyObject *
20328 26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3362 wrap_binaryfunc_l(PyObject self, PyObject args, void *wrapped)
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3363 {
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3364 binaryfunc func = (binaryfunc)wrapped;
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3365 PyObject *other;
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3366
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3367 if (!PyArg_ParseTuple(args, "O", &other))
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3368 return NULL;
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3369 if (!(self->ob_type->tp_flags & Py_TPFLAGS_CHECKTYPES) &&
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3370 !PyType_IsSubtype(other->ob_type, self->ob_type)) {
20328 26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3371 Py_INCREF(Py_NotImplemented);
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3372 return Py_NotImplemented;
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3373 }
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3374 return (*func)(self, other);
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3375 }
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3376
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3377 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3378 wrap_binaryfunc_r(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3379 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3380 binaryfunc func = (binaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3381 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3382
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3383 if (!PyArg_ParseTuple(args, "O", &other))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3384 return NULL;
20328 26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3385 if (!(self->ob_type->tp_flags & Py_TPFLAGS_CHECKTYPES) &&
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3386 !PyType_IsSubtype(other->ob_type, self->ob_type)) {
20328 26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3387 Py_INCREF(Py_NotImplemented);
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3388 return Py_NotImplemented;
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3389 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3390 return (*func)(other, self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3391 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3392
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3393 static PyObject *
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3394 wrap_coercefunc(PyObject self, PyObject args, void *wrapped)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3395 {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3396 coercion func = (coercion)wrapped;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3397 PyObject other, res;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3398 int ok;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3399
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3400 if (!PyArg_ParseTuple(args, "O", &other))
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3401 return NULL;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3402 ok = func(&self, &other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3403 if (ok < 0)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3404 return NULL;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3405 if (ok > 0) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3406 Py_INCREF(Py_NotImplemented);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3407 return Py_NotImplemented;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3408 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3409 res = PyTuple_New(2);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3410 if (res == NULL) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3411 Py_DECREF(self);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3412 Py_DECREF(other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3413 return NULL;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3414 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3415 PyTuple_SET_ITEM(res, 0, self);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3416 PyTuple_SET_ITEM(res, 1, other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3417 return res;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3418 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3419
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3420 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3421 wrap_ternaryfunc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3422 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3423 ternaryfunc func = (ternaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3424 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3425 PyObject *third = Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3426
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3427 /* Note: This wrapper only works for __pow__() */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3428
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3429 if (!PyArg_ParseTuple(args, "O\|O", &other, &third))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3430 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3431 return (*func)(self, other, third);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3432 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3433
20168 091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3434 static PyObject *
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3435 wrap_ternaryfunc_r(PyObject self, PyObject args, void *wrapped)
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3436 {
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3437 ternaryfunc func = (ternaryfunc)wrapped;
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3438 PyObject *other;
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3439 PyObject *third = Py_None;
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3440
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3441 /* Note: This wrapper only works for __pow__() */
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3442
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3443 if (!PyArg_ParseTuple(args, "O\|O", &other, &third))
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3444 return NULL;
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3445 return (*func)(other, self, third);
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3446 }
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3447
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3448 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3449 wrap_unaryfunc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3450 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3451 unaryfunc func = (unaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3452
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3453 if (!PyArg_ParseTuple(args, ""))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3454 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3455 return (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3456 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3457
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3458 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3459 wrap_intargfunc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3460 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3461 intargfunc func = (intargfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3462 int i;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3463
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3464 if (!PyArg_ParseTuple(args, "i", &i))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3465 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3466 return (*func)(self, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3467 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3468
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3469 static int
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3470 getindex(PyObject self, PyObject arg)
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3471 {
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3472 int i;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3473
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3474 i = PyInt_AsLong(arg);
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3475 if (i == -1 && PyErr_Occurred())
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3476 return -1;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3477 if (i < 0) {
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3478 PySequenceMethods *sq = self->ob_type->tp_as_sequence;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3479 if (sq && sq->sq_length) {
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3480 int n = (*sq->sq_length)(self);
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3481 if (n < 0)
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3482 return -1;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3483 i += n;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3484 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3485 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3486 return i;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3487 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3488
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3489 static PyObject *
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3490 wrap_sq_item(PyObject self, PyObject args, void *wrapped)
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3491 {
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3492 intargfunc func = (intargfunc)wrapped;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3493 PyObject *arg;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3494 int i;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3495
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3496 if (PyTuple_GET_SIZE(args) == 1) {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3497 arg = PyTuple_GET_ITEM(args, 0);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3498 i = getindex(self, arg);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3499 if (i == -1 && PyErr_Occurred())
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3500 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3501 return (*func)(self, i);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3502 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3503 PyArg_ParseTuple(args, "O", &arg);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3504 assert(PyErr_Occurred());
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3505 return NULL;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3506 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3507
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3508 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3509 wrap_intintargfunc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3510 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3511 intintargfunc func = (intintargfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3512 int i, j;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3513
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3514 if (!PyArg_ParseTuple(args, "ii", &i, &j))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3515 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3516 return (*func)(self, i, j);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3517 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3518
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3519 static PyObject *
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3520 wrap_sq_setitem(PyObject self, PyObject args, void *wrapped)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3521 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3522 intobjargproc func = (intobjargproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3523 int i, res;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3524 PyObject arg, value;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3525
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3526 if (!PyArg_ParseTuple(args, "OO", &arg, &value))
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3527 return NULL;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3528 i = getindex(self, arg);
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3529 if (i == -1 && PyErr_Occurred())
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3530 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3531 res = (*func)(self, i, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3532 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3533 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3534 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3535 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3536 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3537
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3538 static PyObject *
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3539 wrap_sq_delitem(PyObject self, PyObject args, void *wrapped)
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3540 {
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3541 intobjargproc func = (intobjargproc)wrapped;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3542 int i, res;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3543 PyObject *arg;
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3544
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3545 if (!PyArg_ParseTuple(args, "O", &arg))
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3546 return NULL;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3547 i = getindex(self, arg);
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3548 if (i == -1 && PyErr_Occurred())
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3549 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3550 res = (*func)(self, i, NULL);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3551 if (res == -1 && PyErr_Occurred())
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3552 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3553 Py_INCREF(Py_None);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3554 return Py_None;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3555 }
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3556
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3557 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3558 wrap_intintobjargproc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3559 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3560 intintobjargproc func = (intintobjargproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3561 int i, j, res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3562 PyObject *value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3563
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3564 if (!PyArg_ParseTuple(args, "iiO", &i, &j, &value))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3565 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3566 res = (*func)(self, i, j, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3567 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3568 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3569 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3570 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3571 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3572
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3573 static PyObject *
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3574 wrap_delslice(PyObject self, PyObject args, void *wrapped)
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3575 {
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3576 intintobjargproc func = (intintobjargproc)wrapped;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3577 int i, j, res;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3578
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3579 if (!PyArg_ParseTuple(args, "ii", &i, &j))
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3580 return NULL;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3581 res = (*func)(self, i, j, NULL);
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3582 if (res == -1 && PyErr_Occurred())
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3583 return NULL;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3584 Py_INCREF(Py_None);
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3585 return Py_None;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3586 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3587
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3588 /* XXX objobjproc is a misnomer; should be objargpred */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3589 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3590 wrap_objobjproc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3591 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3592 objobjproc func = (objobjproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3593 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3594 PyObject *value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3595
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3596 if (!PyArg_ParseTuple(args, "O", &value))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3597 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3598 res = (*func)(self, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3599 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3600 return NULL;
30662 6ef245136038 SF patch #820195: make object.__contains__() returns True or False instead Raymond Hettinger <python@rcn.com> parents: 30085 diff changeset	3601 else
6ef245136038 SF patch #820195: make object.__contains__() returns True or False instead Raymond Hettinger <python@rcn.com> parents: 30085 diff changeset	3602 return PyBool_FromLong(res);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3603 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3604
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3605 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3606 wrap_objobjargproc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3607 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3608 objobjargproc func = (objobjargproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3609 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3610 PyObject key, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3611
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3612 if (!PyArg_ParseTuple(args, "OO", &key, &value))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3613 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3614 res = (*func)(self, key, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3615 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3616 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3617 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3618 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3619 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3620
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3621 static PyObject *
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3622 wrap_delitem(PyObject self, PyObject args, void *wrapped)
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3623 {
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3624 objobjargproc func = (objobjargproc)wrapped;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3625 int res;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3626 PyObject *key;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3627
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3628 if (!PyArg_ParseTuple(args, "O", &key))
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3629 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3630 res = (*func)(self, key, NULL);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3631 if (res == -1 && PyErr_Occurred())
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3632 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3633 Py_INCREF(Py_None);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3634 return Py_None;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3635 }
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3636
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3637 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3638 wrap_cmpfunc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3639 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3640 cmpfunc func = (cmpfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3641 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3642 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3643
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3644 if (!PyArg_ParseTuple(args, "O", &other))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3645 return NULL;
20063 9a599b1d9d1c Another comparison patch-up: comparing a type with a dynamic metatype Guido van Rossum <guido@python.org> parents: 20056 diff changeset	3646 if (other->ob_type->tp_compare != func &&
9a599b1d9d1c Another comparison patch-up: comparing a type with a dynamic metatype Guido van Rossum <guido@python.org> parents: 20056 diff changeset	3647 !PyType_IsSubtype(other->ob_type, self->ob_type)) {
19964 43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3648 PyErr_Format(
43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3649 PyExc_TypeError,
43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3650 "%s.__cmp__(x,y) requires y to be a '%s', not a '%s'",
43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3651 self->ob_type->tp_name,
43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3652 self->ob_type->tp_name,
43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3653 other->ob_type->tp_name);
43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3654 return NULL;
43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	3655 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3656 res = (*func)(self, other);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3657 if (PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3658 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3659 return PyInt_FromLong((long)res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3660 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3661
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3662 /* Helper to check for object.__setattr__ or __delattr__ applied to a type.
28621 824dc28f922d Ouch, it's Carlo Verre, not Verre Carlo. Guido van Rossum <guido@python.org> parents: 28608 diff changeset	3663 This is called the Carlo Verre hack after its discoverer. */
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3664 static int
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3665 hackcheck(PyObject self, setattrofunc func, char what)
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3666 {
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3667 PyTypeObject *type = self->ob_type;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3668 while (type && type->tp_flags & Py_TPFLAGS_HEAPTYPE)
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3669 type = type->tp_base;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3670 if (type->tp_setattro != func) {
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3671 PyErr_Format(PyExc_TypeError,
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3672 "can't apply this %s to %s object",
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3673 what,
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3674 type->tp_name);
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3675 return 0;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3676 }
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3677 return 1;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3678 }
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3679
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3680 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3681 wrap_setattr(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3682 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3683 setattrofunc func = (setattrofunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3684 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3685 PyObject name, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3686
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3687 if (!PyArg_ParseTuple(args, "OO", &name, &value))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3688 return NULL;
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3689 if (!hackcheck(self, func, "__setattr__"))
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3690 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3691 res = (*func)(self, name, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3692 if (res < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3693 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3694 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3695 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3696 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3697
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3698 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3699 wrap_delattr(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3700 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3701 setattrofunc func = (setattrofunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3702 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3703 PyObject *name;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3704
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3705 if (!PyArg_ParseTuple(args, "O", &name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3706 return NULL;
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3707 if (!hackcheck(self, func, "__delattr__"))
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3708 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3709 res = (*func)(self, name, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3710 if (res < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3711 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3712 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3713 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3714 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3715
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3716 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3717 wrap_hashfunc(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3718 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3719 hashfunc func = (hashfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3720 long res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3721
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3722 if (!PyArg_ParseTuple(args, ""))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3723 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3724 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3725 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3726 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3727 return PyInt_FromLong(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3728 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3729
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3730 static PyObject *
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	3731 wrap_call(PyObject self, PyObject args, void wrapped, PyObject kwds)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3732 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3733 ternaryfunc func = (ternaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3734
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	3735 return (*func)(self, args, kwds);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3736 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3737
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3738 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3739 wrap_richcmpfunc(PyObject self, PyObject args, void *wrapped, int op)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3740 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3741 richcmpfunc func = (richcmpfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3742 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3743
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3744 if (!PyArg_ParseTuple(args, "O", &other))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3745 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3746 return (*func)(self, other, op);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3747 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3748
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3749 #undef RICHCMP_WRAPPER
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3750 #define RICHCMP_WRAPPER(NAME, OP) \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3751 static PyObject * \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3752 richcmp_##NAME(PyObject self, PyObject args, void *wrapped) \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3753 { \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3754 return wrap_richcmpfunc(self, args, wrapped, OP); \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3755 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3756
19070 39a73c6773f1 Removed extraneous semicolons that caused a gazzilion "empty declaration" warnings in the MetroWerks compiler. Jack Jansen <jack.jansen@cwi.nl> parents: 19040 diff changeset	3757 RICHCMP_WRAPPER(lt, Py_LT)
39a73c6773f1 Removed extraneous semicolons that caused a gazzilion "empty declaration" warnings in the MetroWerks compiler. Jack Jansen <jack.jansen@cwi.nl> parents: 19040 diff changeset	3758 RICHCMP_WRAPPER(le, Py_LE)
39a73c6773f1 Removed extraneous semicolons that caused a gazzilion "empty declaration" warnings in the MetroWerks compiler. Jack Jansen <jack.jansen@cwi.nl> parents: 19040 diff changeset	3759 RICHCMP_WRAPPER(eq, Py_EQ)
39a73c6773f1 Removed extraneous semicolons that caused a gazzilion "empty declaration" warnings in the MetroWerks compiler. Jack Jansen <jack.jansen@cwi.nl> parents: 19040 diff changeset	3760 RICHCMP_WRAPPER(ne, Py_NE)
39a73c6773f1 Removed extraneous semicolons that caused a gazzilion "empty declaration" warnings in the MetroWerks compiler. Jack Jansen <jack.jansen@cwi.nl> parents: 19040 diff changeset	3761 RICHCMP_WRAPPER(gt, Py_GT)
39a73c6773f1 Removed extraneous semicolons that caused a gazzilion "empty declaration" warnings in the MetroWerks compiler. Jack Jansen <jack.jansen@cwi.nl> parents: 19040 diff changeset	3762 RICHCMP_WRAPPER(ge, Py_GE)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3763
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3764 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3765 wrap_next(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3766 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3767 unaryfunc func = (unaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3768 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3769
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3770 if (!PyArg_ParseTuple(args, ""))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3771 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3772 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3773 if (res == NULL && !PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3774 PyErr_SetNone(PyExc_StopIteration);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3775 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3776 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3777
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3778 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3779 wrap_descr_get(PyObject self, PyObject args, void *wrapped)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3780 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3781 descrgetfunc func = (descrgetfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3782 PyObject *obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3783 PyObject *type = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3784
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3785 if (!PyArg_ParseTuple(args, "O\|O", &obj, &type))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3786 return NULL;
27811 42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3787 if (obj == Py_None)
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3788 obj = NULL;
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3789 if (type == Py_None)
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3790 type = NULL;
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3791 if (type == NULL &&obj == NULL) {
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3792 PyErr_SetString(PyExc_TypeError,
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3793 "__get__(None, None) is invalid");
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3794 return NULL;
42396a786f59 Add basic arg sanity checking to wrap_descr_get(). This is called Guido van Rossum <guido@python.org> parents: 27807 diff changeset	3795 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3796 return (*func)(self, obj, type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3797 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3798
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3799 static PyObject *
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3800 wrap_descr_set(PyObject self, PyObject args, void *wrapped)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3801 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3802 descrsetfunc func = (descrsetfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3803 PyObject obj, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3804 int ret;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3805
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3806 if (!PyArg_ParseTuple(args, "OO", &obj, &value))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3807 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3808 ret = (*func)(self, obj, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3809 if (ret < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3810 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3811 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3812 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3813 }
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	3814
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3815 static PyObject *
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3816 wrap_descr_delete(PyObject self, PyObject args, void *wrapped)
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3817 {
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3818 descrsetfunc func = (descrsetfunc)wrapped;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3819 PyObject *obj;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3820 int ret;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3821
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3822 if (!PyArg_ParseTuple(args, "O", &obj))
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3823 return NULL;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3824 ret = (*func)(self, obj, NULL);
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3825 if (ret < 0)
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3826 return NULL;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3827 Py_INCREF(Py_None);
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3828 return Py_None;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3829 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3830
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3831 static PyObject *
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	3832 wrap_init(PyObject self, PyObject args, void wrapped, PyObject kwds)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3833 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3834 initproc func = (initproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3835
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	3836 if (func(self, args, kwds) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3837 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3838 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3839 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3840 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3841
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3842 static PyObject *
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3843 tp_new_wrapper(PyObject self, PyObject args, PyObject *kwds)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3844 {
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3845 PyTypeObject type, subtype, *staticbase;
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3846 PyObject arg0, res;
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3847
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3848 if (self == NULL \|\| !PyType_Check(self))
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3849 Py_FatalError("__new__() called with non-type 'self'");
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3850 type = (PyTypeObject *)self;
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3851 if (!PyTuple_Check(args) \|\| PyTuple_GET_SIZE(args) < 1) {
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3852 PyErr_Format(PyExc_TypeError,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3853 "%s.__new__(): not enough arguments",
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3854 type->tp_name);
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3855 return NULL;
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3856 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3857 arg0 = PyTuple_GET_ITEM(args, 0);
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3858 if (!PyType_Check(arg0)) {
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3859 PyErr_Format(PyExc_TypeError,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3860 "%s.__new__(X): X is not a type object (%s)",
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3861 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3862 arg0->ob_type->tp_name);
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3863 return NULL;
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3864 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3865 subtype = (PyTypeObject *)arg0;
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3866 if (!PyType_IsSubtype(subtype, type)) {
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3867 PyErr_Format(PyExc_TypeError,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3868 "%s.__new__(%s): %s is not a subtype of %s",
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3869 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3870 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3871 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3872 type->tp_name);
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3873 return NULL;
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3874 }
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3875
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3876 /* Check that the use doesn't do something silly and unsafe like
20754 272336648d1f Rename "dictionary" (type and constructor) to "dict". Tim Peters <tim.peters@gmail.com> parents: 20753 diff changeset	3877 object.__new__(dict). To do this, we check that the
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3878 most derived base that's not a heap type is this type. */
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3879 staticbase = subtype;
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3880 while (staticbase && (staticbase->tp_flags & Py_TPFLAGS_HEAPTYPE))
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3881 staticbase = staticbase->tp_base;
19914 2027dc124edd tp_new_wrapper(): A subtle change in the check for safe use. Guido van Rossum <guido@python.org> parents: 19913 diff changeset	3882 if (staticbase->tp_new != type->tp_new) {
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3883 PyErr_Format(PyExc_TypeError,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3884 "%s.__new__(%s) is not safe, use %s.__new__()",
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3885 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3886 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3887 staticbase == NULL ? "?" : staticbase->tp_name);
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3888 return NULL;
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3889 }
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3890
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3891 args = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3892 if (args == NULL)
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3893 return NULL;
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3894 res = type->tp_new(subtype, args, kwds);
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3895 Py_DECREF(args);
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3896 return res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3897 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3898
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3899 static struct PyMethodDef tp_new_methoddef[] = {
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3900 {"__new__", (PyCFunction)tp_new_wrapper, METH_KEYWORDS,
24795 452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	3901 PyDoc_STR("T.__new__(S, ...) -> "
452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	3902 "a new object with type S, a subtype of T")},
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3903 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3904 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3905
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3906 static int
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3907 add_tp_new_wrapper(PyTypeObject *type)
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3908 {
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3909 PyObject *func;
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3910
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3911 if (PyDict_GetItemString(type->tp_dict, "__new__") != NULL)
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3912 return 0;
3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3913 func = PyCFunction_New(tp_new_methoddef, (PyObject *)type);
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3914 if (func == NULL)
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3915 return -1;
32406 d99b5bed0078 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32324 diff changeset	3916 if(PyDict_SetItemString(type->tp_dict, "__new__", func)) {
d99b5bed0078 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32324 diff changeset	3917 Py_DECREF(func);
d99b5bed0078 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32324 diff changeset	3918 return -1;
d99b5bed0078 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32324 diff changeset	3919 }
d99b5bed0078 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32324 diff changeset	3920 Py_DECREF(func);
d99b5bed0078 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32324 diff changeset	3921 return 0;
19011 c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3922 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3923
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3924 /* Slot wrappers that call the corresponding __foo__ slot. See comments
3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3925 below at override_slots() for more explanation. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3926
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3927 #define SLOT0(FUNCNAME, OPSTR) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3928 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3929 FUNCNAME(PyObject *self) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3930 { \
19540 e141b392b61d Fix a typo in SLOT0 macro for the declaration of cache_str. Guido van Rossum <guido@python.org> parents: 19538 diff changeset	3931 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	3932 return call_method(self, OPSTR, &cache_str, "()"); \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3933 }
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3934
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3935 #define SLOT1(FUNCNAME, OPSTR, ARG1TYPE, ARGCODES) \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3936 static PyObject * \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3937 FUNCNAME(PyObject *self, ARG1TYPE arg1) \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3938 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	3939 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	3940 return call_method(self, OPSTR, &cache_str, "(" ARGCODES ")", arg1); \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3941 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3942
27124 d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3943 /* Boolean helper for SLOT1BINFULL().
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3944 right.__class__ is a nontrivial subclass of left.__class__. */
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3945 static int
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3946 method_is_overloaded(PyObject left, PyObject right, char *name)
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3947 {
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3948 PyObject a, b;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3949 int ok;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3950
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3951 b = PyObject_GetAttrString((PyObject *)(right->ob_type), name);
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3952 if (b == NULL) {
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3953 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3954 /* If right doesn't have it, it's not overloaded */
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3955 return 0;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3956 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3957
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3958 a = PyObject_GetAttrString((PyObject *)(left->ob_type), name);
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3959 if (a == NULL) {
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3960 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3961 Py_DECREF(b);
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3962 /* If right has it but left doesn't, it's overloaded */
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3963 return 1;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3964 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3965
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3966 ok = PyObject_RichCompareBool(a, b, Py_NE);
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3967 Py_DECREF(a);
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3968 Py_DECREF(b);
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3969 if (ok < 0) {
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3970 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3971 return 0;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3972 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3973
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3974 return ok;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3975 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3976
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3977
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3978 #define SLOT1BINFULL(FUNCNAME, TESTFUNC, SLOTNAME, OPSTR, ROPSTR) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3979 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3980 FUNCNAME(PyObject self, PyObject other) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3981 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	3982 static PyObject cache_str, rcache_str; \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3983 int do_other = self->ob_type != other->ob_type && \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3984 other->ob_type->tp_as_number != NULL && \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3985 other->ob_type->tp_as_number->SLOTNAME == TESTFUNC; \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3986 if (self->ob_type->tp_as_number != NULL && \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3987 self->ob_type->tp_as_number->SLOTNAME == TESTFUNC) { \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3988 PyObject *r; \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3989 if (do_other && \
27124 d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3990 PyType_IsSubtype(other->ob_type, self->ob_type) && \
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3991 method_is_overloaded(self, other, ROPSTR)) { \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3992 r = call_maybe( \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3993 other, ROPSTR, &rcache_str, "(O)", self); \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3994 if (r != Py_NotImplemented) \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3995 return r; \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3996 Py_DECREF(r); \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3997 do_other = 0; \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3998 } \
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	3999 r = call_maybe( \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4000 self, OPSTR, &cache_str, "(O)", other); \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4001 if (r != Py_NotImplemented \|\| \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4002 other->ob_type == self->ob_type) \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4003 return r; \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4004 Py_DECREF(r); \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4005 } \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4006 if (do_other) { \
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	4007 return call_maybe( \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4008 other, ROPSTR, &rcache_str, "(O)", self); \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4009 } \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4010 Py_INCREF(Py_NotImplemented); \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4011 return Py_NotImplemented; \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4012 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4013
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4014 #define SLOT1BIN(FUNCNAME, SLOTNAME, OPSTR, ROPSTR) \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4015 SLOT1BINFULL(FUNCNAME, FUNCNAME, SLOTNAME, OPSTR, ROPSTR)
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4016
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4017 #define SLOT2(FUNCNAME, OPSTR, ARG1TYPE, ARG2TYPE, ARGCODES) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4018 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4019 FUNCNAME(PyObject *self, ARG1TYPE arg1, ARG2TYPE arg2) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4020 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4021 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4022 return call_method(self, OPSTR, &cache_str, \
cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4023 "(" ARGCODES ")", arg1, arg2); \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4024 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4025
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4026 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4027 slot_sq_length(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4028 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4029 static PyObject *len_str;
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4030 PyObject *res = call_method(self, "__len__", &len_str, "()");
20197 b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4031 int len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4032
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4033 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4034 return -1;
20197 b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4035 len = (int)PyInt_AsLong(res);
b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4036 Py_DECREF(res);
24381 d8a682d4c692 Don't be so hasty. If PyInt_AsLong() raises an error, don't set ValueError. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24376 diff changeset	4037 if (len == -1 && PyErr_Occurred())
d8a682d4c692 Don't be so hasty. If PyInt_AsLong() raises an error, don't set ValueError. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24376 diff changeset	4038 return -1;
24376 aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4039 if (len < 0) {
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	4040 PyErr_SetString(PyExc_ValueError,
24376 aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4041 "__len__() should return >= 0");
aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4042 return -1;
aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4043 }
20197 b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4044 return len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4045 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4046
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4047 SLOT1(slot_sq_concat, "__add__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4048 SLOT1(slot_sq_repeat, "__mul__", int, "i")
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4049
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4050 /* Super-optimized version of slot_sq_item.
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4051 Other slots could do the same... */
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4052 static PyObject *
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4053 slot_sq_item(PyObject *self, int i)
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4054 {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4055 static PyObject *getitem_str;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4056 PyObject func, args = NULL, ival = NULL, retval = NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4057 descrgetfunc f;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4058
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4059 if (getitem_str == NULL) {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4060 getitem_str = PyString_InternFromString("__getitem__");
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4061 if (getitem_str == NULL)
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4062 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4063 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4064 func = _PyType_Lookup(self->ob_type, getitem_str);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4065 if (func != NULL) {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4066 if ((f = func->ob_type->tp_descr_get) == NULL)
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4067 Py_INCREF(func);
25853 680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4068 else {
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4069 func = f(func, self, (PyObject *)(self->ob_type));
25853 680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4070 if (func == NULL) {
680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4071 return NULL;
680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4072 }
680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4073 }
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4074 ival = PyInt_FromLong(i);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4075 if (ival != NULL) {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4076 args = PyTuple_New(1);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4077 if (args != NULL) {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4078 PyTuple_SET_ITEM(args, 0, ival);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4079 retval = PyObject_Call(func, args, NULL);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4080 Py_XDECREF(args);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4081 Py_XDECREF(func);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4082 return retval;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4083 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4084 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4085 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4086 else {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4087 PyErr_SetObject(PyExc_AttributeError, getitem_str);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4088 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4089 Py_XDECREF(args);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4090 Py_XDECREF(ival);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4091 Py_XDECREF(func);
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4092 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4093 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4094
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4095 SLOT2(slot_sq_slice, "__getslice__", int, int, "ii")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4096
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4097 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4098 slot_sq_ass_item(PyObject self, int index, PyObject value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4099 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4100 PyObject *res;
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4101 static PyObject delitem_str, setitem_str;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4102
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4103 if (value == NULL)
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4104 res = call_method(self, "__delitem__", &delitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4105 "(i)", index);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4106 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4107 res = call_method(self, "__setitem__", &setitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4108 "(iO)", index, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4109 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4110 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4111 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4112 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4113 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4114
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4115 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4116 slot_sq_ass_slice(PyObject self, int i, int j, PyObject value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4117 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4118 PyObject *res;
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4119 static PyObject delslice_str, setslice_str;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4120
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4121 if (value == NULL)
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4122 res = call_method(self, "__delslice__", &delslice_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4123 "(ii)", i, j);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4124 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4125 res = call_method(self, "__setslice__", &setslice_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4126 "(iiO)", i, j, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4127 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4128 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4129 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4130 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4131 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4132
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4133 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4134 slot_sq_contains(PyObject self, PyObject value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4135 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4136 PyObject func, res, *args;
28390 33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4137 int result = -1;
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4138
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4139 static PyObject *contains_str;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4140
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4141 func = lookup_maybe(self, "__contains__", &contains_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4142 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4143 args = Py_BuildValue("(O)", value);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4144 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4145 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4146 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4147 res = PyObject_Call(func, args, NULL);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4148 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4149 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4150 Py_DECREF(func);
28390 33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4151 if (res != NULL) {
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4152 result = PyObject_IsTrue(res);
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4153 Py_DECREF(res);
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4154 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4155 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4156 else if (! PyErr_Occurred()) {
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4157 result = _PySequence_IterSearch(self, value,
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4158 PY_ITERSEARCH_CONTAINS);
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4159 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4160 return result;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4161 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4162
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4163 SLOT1(slot_sq_inplace_concat, "__iadd__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4164 SLOT1(slot_sq_inplace_repeat, "__imul__", int, "i")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4165
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4166 #define slot_mp_length slot_sq_length
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4167
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4168 SLOT1(slot_mp_subscript, "__getitem__", PyObject *, "O")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4169
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4170 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4171 slot_mp_ass_subscript(PyObject self, PyObject key, PyObject *value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4172 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4173 PyObject *res;
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4174 static PyObject delitem_str, setitem_str;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4175
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4176 if (value == NULL)
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4177 res = call_method(self, "__delitem__", &delitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4178 "(O)", key);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4179 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4180 res = call_method(self, "__setitem__", &setitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4181 "(OO)", key, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4182 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4183 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4184 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4185 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4186 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4187
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4188 SLOT1BIN(slot_nb_add, nb_add, "__add__", "__radd__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4189 SLOT1BIN(slot_nb_subtract, nb_subtract, "__sub__", "__rsub__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4190 SLOT1BIN(slot_nb_multiply, nb_multiply, "__mul__", "__rmul__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4191 SLOT1BIN(slot_nb_divide, nb_divide, "__div__", "__rdiv__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4192 SLOT1BIN(slot_nb_remainder, nb_remainder, "__mod__", "__rmod__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4193 SLOT1BIN(slot_nb_divmod, nb_divmod, "__divmod__", "__rdivmod__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4194
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	4195 static PyObject slot_nb_power(PyObject , PyObject , PyObject );
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4196
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4197 SLOT1BINFULL(slot_nb_power_binary, slot_nb_power,
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4198 nb_power, "__pow__", "__rpow__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4199
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4200 static PyObject *
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4201 slot_nb_power(PyObject self, PyObject other, PyObject *modulus)
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4202 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4203 static PyObject *pow_str;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4204
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4205 if (modulus == Py_None)
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4206 return slot_nb_power_binary(self, other);
23753 41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4207 /* Three-arg power doesn't use __rpow__. But ternary_op
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4208 can call this when the second argument's type uses
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4209 slot_nb_power, so check before calling self.__pow__. */
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4210 if (self->ob_type->tp_as_number != NULL &&
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4211 self->ob_type->tp_as_number->nb_power == slot_nb_power) {
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4212 return call_method(self, "__pow__", &pow_str,
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4213 "(OO)", other, modulus);
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4214 }
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4215 Py_INCREF(Py_NotImplemented);
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4216 return Py_NotImplemented;
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4217 }
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4218
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4219 SLOT0(slot_nb_negative, "__neg__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4220 SLOT0(slot_nb_positive, "__pos__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4221 SLOT0(slot_nb_absolute, "__abs__")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4222
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4223 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4224 slot_nb_nonzero(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4225 {
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4226 PyObject func, args;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4227 static PyObject nonzero_str, len_str;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4228 int result = -1;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4229
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4230 func = lookup_maybe(self, "__nonzero__", &nonzero_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4231 if (func == NULL) {
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4232 if (PyErr_Occurred())
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4233 return -1;
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4234 func = lookup_maybe(self, "__len__", &len_str);
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4235 if (func == NULL)
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4236 return PyErr_Occurred() ? -1 : 1;
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4237 }
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4238 args = PyTuple_New(0);
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4239 if (args != NULL) {
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4240 PyObject *temp = PyObject_Call(func, args, NULL);
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4241 Py_DECREF(args);
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4242 if (temp != NULL) {
29611 cac855387b56 Require that __nonzero__() return a bool or exactly an int. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29607 diff changeset	4243 if (PyInt_CheckExact(temp) \|\| PyBool_Check(temp))
29607 60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4244 result = PyObject_IsTrue(temp);
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4245 else {
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4246 PyErr_Format(PyExc_TypeError,
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4247 "__nonzero__ should return "
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4248 "bool or int, returned %s",
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4249 temp->ob_type->tp_name);
29611 cac855387b56 Require that __nonzero__() return a bool or exactly an int. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29607 diff changeset	4250 result = -1;
29607 60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4251 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4252 Py_DECREF(temp);
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4253 }
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4254 }
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4255 Py_DECREF(func);
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4256 return result;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4257 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4258
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4259 SLOT0(slot_nb_invert, "__invert__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4260 SLOT1BIN(slot_nb_lshift, nb_lshift, "__lshift__", "__rlshift__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4261 SLOT1BIN(slot_nb_rshift, nb_rshift, "__rshift__", "__rrshift__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4262 SLOT1BIN(slot_nb_and, nb_and, "__and__", "__rand__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4263 SLOT1BIN(slot_nb_xor, nb_xor, "__xor__", "__rxor__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4264 SLOT1BIN(slot_nb_or, nb_or, "__or__", "__ror__")
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4265
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4266 static int
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4267 slot_nb_coerce(PyObject a, PyObject b)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4268 {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4269 static PyObject *coerce_str;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4270 PyObject self = a, other = b;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4271
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4272 if (self->ob_type->tp_as_number != NULL &&
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4273 self->ob_type->tp_as_number->nb_coerce == slot_nb_coerce) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4274 PyObject *r;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4275 r = call_maybe(
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4276 self, "__coerce__", &coerce_str, "(O)", other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4277 if (r == NULL)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4278 return -1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4279 if (r == Py_NotImplemented) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4280 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4281 }
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4282 else {
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4283 if (!PyTuple_Check(r) \|\| PyTuple_GET_SIZE(r) != 2) {
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4284 PyErr_SetString(PyExc_TypeError,
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4285 "__coerce__ didn't return a 2-tuple");
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4286 Py_DECREF(r);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4287 return -1;
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4288 }
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4289 *a = PyTuple_GET_ITEM(r, 0);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4290 Py_INCREF(*a);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4291 *b = PyTuple_GET_ITEM(r, 1);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4292 Py_INCREF(*b);
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4293 Py_DECREF(r);
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4294 return 0;
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4295 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4296 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4297 if (other->ob_type->tp_as_number != NULL &&
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4298 other->ob_type->tp_as_number->nb_coerce == slot_nb_coerce) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4299 PyObject *r;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4300 r = call_maybe(
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4301 other, "__coerce__", &coerce_str, "(O)", self);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4302 if (r == NULL)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4303 return -1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4304 if (r == Py_NotImplemented) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4305 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4306 return 1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4307 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4308 if (!PyTuple_Check(r) \|\| PyTuple_GET_SIZE(r) != 2) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4309 PyErr_SetString(PyExc_TypeError,
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4310 "__coerce__ didn't return a 2-tuple");
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4311 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4312 return -1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4313 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4314 *a = PyTuple_GET_ITEM(r, 1);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4315 Py_INCREF(*a);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4316 *b = PyTuple_GET_ITEM(r, 0);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4317 Py_INCREF(*b);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4318 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4319 return 0;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4320 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4321 return 1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4322 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4323
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4324 SLOT0(slot_nb_int, "__int__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4325 SLOT0(slot_nb_long, "__long__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4326 SLOT0(slot_nb_float, "__float__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4327 SLOT0(slot_nb_oct, "__oct__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4328 SLOT0(slot_nb_hex, "__hex__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4329 SLOT1(slot_nb_inplace_add, "__iadd__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4330 SLOT1(slot_nb_inplace_subtract, "__isub__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4331 SLOT1(slot_nb_inplace_multiply, "__imul__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4332 SLOT1(slot_nb_inplace_divide, "__idiv__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4333 SLOT1(slot_nb_inplace_remainder, "__imod__", PyObject *, "O")
25794 001b789f1f84 For some reason (probably cut and paste), __ipow__ for new-style Guido van Rossum <guido@python.org> parents: 25793 diff changeset	4334 SLOT1(slot_nb_inplace_power, "__ipow__", PyObject *, "O")
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4335 SLOT1(slot_nb_inplace_lshift, "__ilshift__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4336 SLOT1(slot_nb_inplace_rshift, "__irshift__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4337 SLOT1(slot_nb_inplace_and, "__iand__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4338 SLOT1(slot_nb_inplace_xor, "__ixor__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4339 SLOT1(slot_nb_inplace_or, "__ior__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4340 SLOT1BIN(slot_nb_floor_divide, nb_floor_divide,
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4341 "__floordiv__", "__rfloordiv__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4342 SLOT1BIN(slot_nb_true_divide, nb_true_divide, "__truediv__", "__rtruediv__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4343 SLOT1(slot_nb_inplace_floor_divide, "__ifloordiv__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4344 SLOT1(slot_nb_inplace_true_divide, "__itruediv__", PyObject *, "O")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4345
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4346 static int
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4347 half_compare(PyObject self, PyObject other)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4348 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4349 PyObject func, args, *res;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4350 static PyObject *cmp_str;
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4351 int c;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4352
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4353 func = lookup_method(self, "__cmp__", &cmp_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4354 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4355 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4356 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4357 else {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4358 args = Py_BuildValue("(O)", other);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4359 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4360 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4361 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4362 res = PyObject_Call(func, args, NULL);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4363 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4364 }
23967 1a8096bb4c48 Fix SF bug 572567: Memory leak in object comparison. Raymond Hettinger <python@rcn.com> parents: 23950 diff changeset	4365 Py_DECREF(func);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4366 if (res != Py_NotImplemented) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4367 if (res == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4368 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4369 c = PyInt_AsLong(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4370 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4371 if (c == -1 && PyErr_Occurred())
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4372 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4373 return (c < 0) ? -1 : (c > 0) ? 1 : 0;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4374 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4375 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4376 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4377 return 2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4378 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4379
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4380 /* This slot is published for the benefit of try_3way_compare in object.c */
f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4381 int
f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4382 _PyObject_SlotCompare(PyObject self, PyObject other)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4383 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4384 int c;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4385
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4386 if (self->ob_type->tp_compare == _PyObject_SlotCompare) {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4387 c = half_compare(self, other);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4388 if (c <= 1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4389 return c;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4390 }
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4391 if (other->ob_type->tp_compare == _PyObject_SlotCompare) {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4392 c = half_compare(other, self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4393 if (c < -1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4394 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4395 if (c <= 1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4396 return -c;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4397 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4398 return (void )self < (void )other ? -1 :
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4399 (void )self > (void )other ? 1 : 0;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4400 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4401
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4402 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4403 slot_tp_repr(PyObject *self)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4404 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4405 PyObject func, res;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4406 static PyObject *repr_str;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4407
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4408 func = lookup_method(self, "__repr__", &repr_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4409 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4410 res = PyEval_CallObject(func, NULL);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4411 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4412 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4413 }
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	4414 PyErr_Clear();
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	4415 return PyString_FromFormat("<%s object at %p>",
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	4416 self->ob_type->tp_name, self);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4417 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4418
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4419 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4420 slot_tp_str(PyObject *self)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4421 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4422 PyObject func, res;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4423 static PyObject *str_str;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4424
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4425 func = lookup_method(self, "__str__", &str_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4426 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4427 res = PyEval_CallObject(func, NULL);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4428 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4429 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4430 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4431 else {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4432 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4433 return slot_tp_repr(self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4434 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4435 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4436
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4437 static long
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4438 slot_tp_hash(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4439 {
26559 0dbf98ee118e slot_tp_hash(): In the normal path, this leaked a reference to the Tim Peters <tim.peters@gmail.com> parents: 26448 diff changeset	4440 PyObject *func;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4441 static PyObject hash_str, eq_str, *cmp_str;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4442 long h;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4443
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4444 func = lookup_method(self, "__hash__", &hash_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4445
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4446 if (func != NULL) {
26559 0dbf98ee118e slot_tp_hash(): In the normal path, this leaked a reference to the Tim Peters <tim.peters@gmail.com> parents: 26448 diff changeset	4447 PyObject *res = PyEval_CallObject(func, NULL);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4448 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4449 if (res == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4450 return -1;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4451 h = PyInt_AsLong(res);
26559 0dbf98ee118e slot_tp_hash(): In the normal path, this leaked a reference to the Tim Peters <tim.peters@gmail.com> parents: 26448 diff changeset	4452 Py_DECREF(res);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4453 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4454 else {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4455 PyErr_Clear();
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4456 func = lookup_method(self, "__eq__", &eq_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4457 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4458 PyErr_Clear();
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4459 func = lookup_method(self, "__cmp__", &cmp_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4460 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4461 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4462 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4463 PyErr_SetString(PyExc_TypeError, "unhashable type");
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4464 return -1;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4465 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4466 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4467 h = _Py_HashPointer((void *)self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4468 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4469 if (h == -1 && !PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4470 h = -2;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4471 return h;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4472 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4473
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4474 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4475 slot_tp_call(PyObject self, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4476 {
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4477 static PyObject *call_str;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4478 PyObject *meth = lookup_method(self, "__call__", &call_str);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4479 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4480
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4481 if (meth == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4482 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4483 res = PyObject_Call(meth, args, kwds);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4484 Py_DECREF(meth);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4485 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4486 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4487
20499 a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4488 /* There are two slot dispatch functions for tp_getattro.
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4489
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4490 - slot_tp_getattro() is used when __getattribute__ is overridden
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4491 but no __getattr__ hook is present;
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4492
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4493 - slot_tp_getattr_hook() is used when a __getattr__ hook is present.
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4494
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4495 The code in update_one_slot() always installs slot_tp_getattr_hook(); this
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4496 detects the absence of __getattr__ and then installs the simpler slot if
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4497 necessary. */
20499 a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4498
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4499 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4500 slot_tp_getattro(PyObject self, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4501 {
20499 a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4502 static PyObject *getattribute_str = NULL;
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4503 return call_method(self, "__getattribute__", &getattribute_str,
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4504 "(O)", name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4505 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4506
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4507 static PyObject *
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4508 slot_tp_getattr_hook(PyObject self, PyObject name)
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4509 {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4510 PyTypeObject *tp = self->ob_type;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4511 PyObject getattr, getattribute, *res;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4512 static PyObject *getattribute_str = NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4513 static PyObject *getattr_str = NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4514
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4515 if (getattr_str == NULL) {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4516 getattr_str = PyString_InternFromString("__getattr__");
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4517 if (getattr_str == NULL)
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4518 return NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4519 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4520 if (getattribute_str == NULL) {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4521 getattribute_str =
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4522 PyString_InternFromString("__getattribute__");
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4523 if (getattribute_str == NULL)
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4524 return NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4525 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4526 getattr = _PyType_Lookup(tp, getattr_str);
20499 a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4527 if (getattr == NULL) {
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	4528 /* No __getattr__ hook: use a simpler dispatcher */
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	4529 tp->tp_getattro = slot_tp_getattro;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	4530 return slot_tp_getattro(self, name);
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	4531 }
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4532 getattribute = _PyType_Lookup(tp, getattribute_str);
20499 a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4533 if (getattribute == NULL \|\|
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4534 (getattribute->ob_type == &PyWrapperDescr_Type &&
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4535 ((PyWrapperDescrObject *)getattribute)->d_wrapped ==
a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4536 (void *)PyObject_GenericGetAttr))
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4537 res = PyObject_GenericGetAttr(self, name);
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4538 else
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4539 res = PyObject_CallFunction(getattribute, "OO", self, name);
20499 a0c8c2e5a44d Remove a bunch of stuff that's no longer needed now that update_slot() Guido van Rossum <guido@python.org> parents: 20489 diff changeset	4540 if (res == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4541 PyErr_Clear();
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4542 res = PyObject_CallFunction(getattr, "OO", self, name);
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4543 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4544 return res;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4545 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4546
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4547 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4548 slot_tp_setattro(PyObject self, PyObject name, PyObject *value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4549 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4550 PyObject *res;
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4551 static PyObject delattr_str, setattr_str;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4552
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4553 if (value == NULL)
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4554 res = call_method(self, "__delattr__", &delattr_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4555 "(O)", name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4556 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4557 res = call_method(self, "__setattr__", &setattr_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4558 "(OO)", name, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4559 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4560 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4561 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4562 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4563 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4564
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4565 /* Map rich comparison operators to their __xx__ namesakes */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4566 static char *name_op[] = {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4567 "__lt__",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4568 "__le__",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4569 "__eq__",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4570 "__ne__",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4571 "__gt__",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4572 "__ge__",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4573 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4574
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4575 static PyObject *
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4576 half_richcompare(PyObject self, PyObject other, int op)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4577 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4578 PyObject func, args, *res;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4579 static PyObject *op_str[6];
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4580
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4581 func = lookup_method(self, name_op[op], &op_str[op]);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4582 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4583 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4584 Py_INCREF(Py_NotImplemented);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4585 return Py_NotImplemented;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4586 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4587 args = Py_BuildValue("(O)", other);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4588 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4589 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4590 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4591 res = PyObject_Call(func, args, NULL);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4592 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4593 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4594 Py_DECREF(func);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4595 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4596 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4597
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4598 /* Map rich comparison operators to their swapped version, e.g. LT --> GT */
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4599 static int swapped_op[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE};
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4600
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4601 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4602 slot_tp_richcompare(PyObject self, PyObject other, int op)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4603 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4604 PyObject *res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4605
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4606 if (self->ob_type->tp_richcompare == slot_tp_richcompare) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4607 res = half_richcompare(self, other, op);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4608 if (res != Py_NotImplemented)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4609 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4610 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4611 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4612 if (other->ob_type->tp_richcompare == slot_tp_richcompare) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4613 res = half_richcompare(other, self, swapped_op[op]);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4614 if (res != Py_NotImplemented) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4615 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4616 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4617 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4618 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4619 Py_INCREF(Py_NotImplemented);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4620 return Py_NotImplemented;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4621 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4622
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4623 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4624 slot_tp_iter(PyObject *self)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4625 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4626 PyObject func, res;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4627 static PyObject iter_str, getitem_str;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4628
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4629 func = lookup_method(self, "__iter__", &iter_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4630 if (func != NULL) {
24867 255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4631 PyObject *args;
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4632 args = res = PyTuple_New(0);
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4633 if (args != NULL) {
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4634 res = PyObject_Call(func, args, NULL);
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4635 Py_DECREF(args);
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4636 }
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4637 Py_DECREF(func);
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4638 return res;
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4639 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4640 PyErr_Clear();
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4641 func = lookup_method(self, "__getitem__", &getitem_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4642 if (func == NULL) {
22774 02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	4643 PyErr_SetString(PyExc_TypeError,
02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	4644 "iteration over non-sequence");
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4645 return NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4646 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4647 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4648 return PySeqIter_New(self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4649 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4650
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4651 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4652 slot_tp_iternext(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4653 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4654 static PyObject *next_str;
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4655 return call_method(self, "next", &next_str, "()");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4656 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4657
19339 6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4658 static PyObject *
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4659 slot_tp_descr_get(PyObject self, PyObject obj, PyObject *type)
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4660 {
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4661 PyTypeObject *tp = self->ob_type;
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4662 PyObject *get;
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4663 static PyObject *get_str = NULL;
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4664
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4665 if (get_str == NULL) {
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4666 get_str = PyString_InternFromString("__get__");
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4667 if (get_str == NULL)
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4668 return NULL;
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4669 }
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4670 get = _PyType_Lookup(tp, get_str);
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4671 if (get == NULL) {
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4672 /* Avoid further slowdowns */
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4673 if (tp->tp_descr_get == slot_tp_descr_get)
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4674 tp->tp_descr_get = NULL;
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4675 Py_INCREF(self);
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4676 return self;
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4677 }
19464 45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4678 if (obj == NULL)
45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4679 obj = Py_None;
45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4680 if (type == NULL)
45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4681 type = Py_None;
19339 6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4682 return PyObject_CallFunction(get, "OOO", self, obj, type);
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4683 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4684
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4685 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4686 slot_tp_descr_set(PyObject self, PyObject target, PyObject *value)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4687 {
19464 45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4688 PyObject *res;
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4689 static PyObject del_str, set_str;
19464 45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4690
45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4691 if (value == NULL)
21142 842b280421ba Fix for SF bug #485678. Guido van Rossum <guido@python.org> parents: 20978 diff changeset	4692 res = call_method(self, "__delete__", &del_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4693 "(O)", target);
19464 45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4694 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4695 res = call_method(self, "__set__", &set_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4696 "(OO)", target, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4697 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4698 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4699 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4700 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4701 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4702
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4703 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4704 slot_tp_init(PyObject self, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4705 {
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4706 static PyObject *init_str;
9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	4707 PyObject *meth = lookup_method(self, "__init__", &init_str);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4708 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4709
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4710 if (meth == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4711 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4712 res = PyObject_Call(meth, args, kwds);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4713 Py_DECREF(meth);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4714 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4715 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4716 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4717 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4718 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4719
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4720 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4721 slot_tp_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4722 {
24680 6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4723 static PyObject *new_str;
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4724 PyObject *func;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4725 PyObject newargs, x;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4726 int i, n;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4727
24680 6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4728 if (new_str == NULL) {
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4729 new_str = PyString_InternFromString("__new__");
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4730 if (new_str == NULL)
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4731 return NULL;
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4732 }
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4733 func = PyObject_GetAttr((PyObject *)type, new_str);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4734 if (func == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4735 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4736 assert(PyTuple_Check(args));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4737 n = PyTuple_GET_SIZE(args);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4738 newargs = PyTuple_New(n+1);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4739 if (newargs == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4740 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4741 Py_INCREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4742 PyTuple_SET_ITEM(newargs, 0, (PyObject *)type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4743 for (i = 0; i < n; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4744 x = PyTuple_GET_ITEM(args, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4745 Py_INCREF(x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4746 PyTuple_SET_ITEM(newargs, i+1, x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4747 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4748 x = PyObject_Call(func, newargs, kwds);
20195 3408d929bb94 slot_tp_new(): newargs was leaking. Guido van Rossum <guido@python.org> parents: 20190 diff changeset	4749 Py_DECREF(newargs);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4750 Py_DECREF(func);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4751 return x;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4752 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4753
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4754 static void
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4755 slot_tp_del(PyObject *self)
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4756 {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4757 static PyObject *del_str = NULL;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4758 PyObject del, res;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4759 PyObject error_type, error_value, *error_traceback;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4760
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4761 /* Temporarily resurrect the object. */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4762 assert(self->ob_refcnt == 0);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4763 self->ob_refcnt = 1;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4764
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4765 /* Save the current exception, if any. */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4766 PyErr_Fetch(&error_type, &error_value, &error_traceback);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4767
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4768 /* Execute __del__ method, if any. */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4769 del = lookup_maybe(self, "__del__", &del_str);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4770 if (del != NULL) {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4771 res = PyEval_CallObject(del, NULL);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4772 if (res == NULL)
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4773 PyErr_WriteUnraisable(del);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4774 else
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4775 Py_DECREF(res);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4776 Py_DECREF(del);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4777 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4778
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4779 /* Restore the saved exception. */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4780 PyErr_Restore(error_type, error_value, error_traceback);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4781
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4782 /* Undo the temporary resurrection; can't use DECREF here, it would
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4783 * cause a recursive call.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4784 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4785 assert(self->ob_refcnt > 0);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4786 if (--self->ob_refcnt == 0)
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4787 return; /* this is the normal path out */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4788
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4789 /* __del__ resurrected it! Make it look like the original Py_DECREF
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4790 * never happened.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4791 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4792 {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4793 int refcnt = self->ob_refcnt;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4794 _Py_NewReference(self);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4795 self->ob_refcnt = refcnt;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4796 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4797 assert(!PyType_IS_GC(self->ob_type) \|\|
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4798 _Py_AS_GC(self)->gc.gc_refs != _PyGC_REFS_UNTRACKED);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4799 /* If Py_REF_DEBUG, the original decref dropped _Py_RefTotal, but
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4800 * _Py_NewReference bumped it again, so that's a wash.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4801 * If Py_TRACE_REFS, _Py_NewReference re-added self to the object
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4802 * chain, so no more to do there either.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4803 * If COUNT_ALLOCS, the original decref bumped tp_frees, and
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4804 * _Py_NewReference bumped tp_allocs: both of those need to be
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4805 * undone.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4806 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4807 #ifdef COUNT_ALLOCS
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4808 --self->ob_type->tp_frees;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4809 --self->ob_type->tp_allocs;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4810 #endif
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4811 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4812
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4813
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4814 /* Table mapping __foo__ names to tp_foo offsets and slot_tp_foo wrapper
28390 33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4815 functions. The offsets here are relative to the 'PyHeapTypeObject'
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	4816 structure, which incorporates the additional structures used for numbers,
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	4817 sequences and mappings.
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	4818 Note that multiple names may map to the same slot (e.g. __eq__,
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4819 __ne__ etc. all map to tp_richcompare) and one name may map to multiple
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4820 slots (e.g. __str__ affects tp_str as well as tp_repr). The table is
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4821 terminated with an all-zero entry. (This table is further initialized and
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4822 sorted in init_slotdefs() below.) */
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4823
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4824 typedef struct wrapperbase slotdef;
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4825
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4826 #undef TPSLOT
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	4827 #undef FLSLOT
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4828 #undef ETSLOT
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4829 #undef SQSLOT
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4830 #undef MPSLOT
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4831 #undef NBSLOT
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4832 #undef UNSLOT
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4833 #undef IBSLOT
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4834 #undef BINSLOT
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4835 #undef RBINSLOT
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4836
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4837 #define TPSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC) \
24789 fcbde226545c Allow docstrings to be removed during compilation for SLOT macro and friends Neal Norwitz <nnorwitz@gmail.com>* parents: 24785 diff changeset	4838 {NAME, offsetof(PyTypeObject, SLOT), (void *)(FUNCTION), WRAPPER, \
fcbde226545c Allow docstrings to be removed during compilation for SLOT macro and friends Neal Norwitz <nnorwitz@gmail.com>* parents: 24785 diff changeset	4839 PyDoc_STR(DOC)}
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	4840 #define FLSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC, FLAGS) \
ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	4841 {NAME, offsetof(PyTypeObject, SLOT), (void *)(FUNCTION), WRAPPER, \
24789 fcbde226545c Allow docstrings to be removed during compilation for SLOT macro and friends Neal Norwitz <nnorwitz@gmail.com>* parents: 24785 diff changeset	4842 PyDoc_STR(DOC), FLAGS}
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4843 #define ETSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC) \
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	4844 {NAME, offsetof(PyHeapTypeObject, SLOT), (void *)(FUNCTION), WRAPPER, \
24789 fcbde226545c Allow docstrings to be removed during compilation for SLOT macro and friends Neal Norwitz <nnorwitz@gmail.com>* parents: 24785 diff changeset	4845 PyDoc_STR(DOC)}
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4846 #define SQSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC) \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4847 ETSLOT(NAME, as_sequence.SLOT, FUNCTION, WRAPPER, DOC)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4848 #define MPSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC) \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4849 ETSLOT(NAME, as_mapping.SLOT, FUNCTION, WRAPPER, DOC)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4850 #define NBSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC) \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4851 ETSLOT(NAME, as_number.SLOT, FUNCTION, WRAPPER, DOC)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4852 #define UNSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC) \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4853 ETSLOT(NAME, as_number.SLOT, FUNCTION, WRAPPER, \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4854 "x." NAME "() <==> " DOC)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4855 #define IBSLOT(NAME, SLOT, FUNCTION, WRAPPER, DOC) \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4856 ETSLOT(NAME, as_number.SLOT, FUNCTION, WRAPPER, \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4857 "x." NAME "(y) <==> x" DOC "y")
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4858 #define BINSLOT(NAME, SLOT, FUNCTION, DOC) \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4859 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_l, \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4860 "x." NAME "(y) <==> x" DOC "y")
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4861 #define RBINSLOT(NAME, SLOT, FUNCTION, DOC) \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4862 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_r, \
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4863 "x." NAME "(y) <==> y" DOC "x")
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4864
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4865 static slotdef slotdefs[] = {
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4866 SQSLOT("__len__", sq_length, slot_sq_length, wrap_inquiry,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4867 "x.__len__() <==> len(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4868 SQSLOT("__add__", sq_concat, slot_sq_concat, wrap_binaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4869 "x.__add__(y) <==> x+y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4870 SQSLOT("__mul__", sq_repeat, slot_sq_repeat, wrap_intargfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4871 "x.__mul__(n) <==> x*n"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4872 SQSLOT("__rmul__", sq_repeat, slot_sq_repeat, wrap_intargfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4873 "x.__rmul__(n) <==> n*x"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4874 SQSLOT("__getitem__", sq_item, slot_sq_item, wrap_sq_item,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4875 "x.__getitem__(y) <==> x[y]"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4876 SQSLOT("__getslice__", sq_slice, slot_sq_slice, wrap_intintargfunc,
29172 9ae17b3779bb Fix docstrings for __(get\|set\|del)slice__ to mention that negative indices are not supported. Brett Cannon <bcannon@gmail.com> parents: 29066 diff changeset	4877 "x.__getslice__(i, j) <==> x[i:j]\n\
9ae17b3779bb Fix docstrings for __(get\|set\|del)slice__ to mention that negative indices are not supported. Brett Cannon <bcannon@gmail.com> parents: 29066 diff changeset	4878 \n\
9ae17b3779bb Fix docstrings for __(get\|set\|del)slice__ to mention that negative indices are not supported. Brett Cannon <bcannon@gmail.com> parents: 29066 diff changeset	4879 Use of negative indices is not supported."),
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4880 SQSLOT("__setitem__", sq_ass_item, slot_sq_ass_item, wrap_sq_setitem,
29173 421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4881 "x.__setitem__(i, y) <==> x[i]=y"),
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4882 SQSLOT("__delitem__", sq_ass_item, slot_sq_ass_item, wrap_sq_delitem,
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4883 "x.__delitem__(y) <==> del x[y]"),
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4884 SQSLOT("__setslice__", sq_ass_slice, slot_sq_ass_slice,
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4885 wrap_intintobjargproc,
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4886 "x.__setslice__(i, j, y) <==> x[i:j]=y\n\
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4887 \n\
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4888 Use of negative indices is not supported."),
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4889 SQSLOT("__delslice__", sq_ass_slice, slot_sq_ass_slice, wrap_delslice,
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4890 "x.__delslice__(i, j) <==> del x[i:j]\n\
29172 9ae17b3779bb Fix docstrings for __(get\|set\|del)slice__ to mention that negative indices are not supported. Brett Cannon <bcannon@gmail.com> parents: 29066 diff changeset	4891 \n\
9ae17b3779bb Fix docstrings for __(get\|set\|del)slice__ to mention that negative indices are not supported. Brett Cannon <bcannon@gmail.com> parents: 29066 diff changeset	4892 Use of negative indices is not supported."),
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4893 SQSLOT("__contains__", sq_contains, slot_sq_contains, wrap_objobjproc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4894 "x.__contains__(y) <==> y in x"),
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4895 SQSLOT("__iadd__", sq_inplace_concat, slot_sq_inplace_concat,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4896 wrap_binaryfunc, "x.__iadd__(y) <==> x+=y"),
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4897 SQSLOT("__imul__", sq_inplace_repeat, slot_sq_inplace_repeat,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4898 wrap_intargfunc, "x.__imul__(y) <==> x*=y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4899
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4900 MPSLOT("__len__", mp_length, slot_mp_length, wrap_inquiry,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4901 "x.__len__() <==> len(x)"),
20345 67a7a99f2d5a The slot definition table entry for mp_getitem had a bogus wrapper Guido van Rossum <guido@python.org> parents: 20343 diff changeset	4902 MPSLOT("__getitem__", mp_subscript, slot_mp_subscript,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4903 wrap_binaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4904 "x.__getitem__(y) <==> x[y]"),
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4905 MPSLOT("__setitem__", mp_ass_subscript, slot_mp_ass_subscript,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4906 wrap_objobjargproc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4907 "x.__setitem__(i, y) <==> x[i]=y"),
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4908 MPSLOT("__delitem__", mp_ass_subscript, slot_mp_ass_subscript,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4909 wrap_delitem,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4910 "x.__delitem__(y) <==> del x[y]"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4911
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4912 BINSLOT("__add__", nb_add, slot_nb_add,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4913 "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4914 RBINSLOT("__radd__", nb_add, slot_nb_add,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4915 "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4916 BINSLOT("__sub__", nb_subtract, slot_nb_subtract,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4917 "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4918 RBINSLOT("__rsub__", nb_subtract, slot_nb_subtract,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4919 "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4920 BINSLOT("__mul__", nb_multiply, slot_nb_multiply,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4921 "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4922 RBINSLOT("__rmul__", nb_multiply, slot_nb_multiply,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4923 "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4924 BINSLOT("__div__", nb_divide, slot_nb_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4925 "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4926 RBINSLOT("__rdiv__", nb_divide, slot_nb_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4927 "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4928 BINSLOT("__mod__", nb_remainder, slot_nb_remainder,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4929 "%"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4930 RBINSLOT("__rmod__", nb_remainder, slot_nb_remainder,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4931 "%"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4932 BINSLOT("__divmod__", nb_divmod, slot_nb_divmod,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4933 "divmod(x, y)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4934 RBINSLOT("__rdivmod__", nb_divmod, slot_nb_divmod,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4935 "divmod(y, x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4936 NBSLOT("__pow__", nb_power, slot_nb_power, wrap_ternaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4937 "x.__pow__(y[, z]) <==> pow(x, y[, z])"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4938 NBSLOT("__rpow__", nb_power, slot_nb_power, wrap_ternaryfunc_r,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4939 "y.__rpow__(x[, z]) <==> pow(x, y[, z])"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4940 UNSLOT("__neg__", nb_negative, slot_nb_negative, wrap_unaryfunc, "-x"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4941 UNSLOT("__pos__", nb_positive, slot_nb_positive, wrap_unaryfunc, "+x"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4942 UNSLOT("__abs__", nb_absolute, slot_nb_absolute, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4943 "abs(x)"),
30685 6c38406c3fad Backport fix to SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30662 diff changeset	4944 UNSLOT("__nonzero__", nb_nonzero, slot_nb_nonzero, wrap_inquirypred,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4945 "x != 0"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4946 UNSLOT("__invert__", nb_invert, slot_nb_invert, wrap_unaryfunc, "~x"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4947 BINSLOT("__lshift__", nb_lshift, slot_nb_lshift, "<<"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4948 RBINSLOT("__rlshift__", nb_lshift, slot_nb_lshift, "<<"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4949 BINSLOT("__rshift__", nb_rshift, slot_nb_rshift, ">>"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4950 RBINSLOT("__rrshift__", nb_rshift, slot_nb_rshift, ">>"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4951 BINSLOT("__and__", nb_and, slot_nb_and, "&"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4952 RBINSLOT("__rand__", nb_and, slot_nb_and, "&"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4953 BINSLOT("__xor__", nb_xor, slot_nb_xor, "^"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4954 RBINSLOT("__rxor__", nb_xor, slot_nb_xor, "^"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4955 BINSLOT("__or__", nb_or, slot_nb_or, "\|"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4956 RBINSLOT("__ror__", nb_or, slot_nb_or, "\|"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4957 NBSLOT("__coerce__", nb_coerce, slot_nb_coerce, wrap_coercefunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4958 "x.__coerce__(y) <==> coerce(x, y)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4959 UNSLOT("__int__", nb_int, slot_nb_int, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4960 "int(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4961 UNSLOT("__long__", nb_long, slot_nb_long, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4962 "long(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4963 UNSLOT("__float__", nb_float, slot_nb_float, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4964 "float(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4965 UNSLOT("__oct__", nb_oct, slot_nb_oct, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4966 "oct(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4967 UNSLOT("__hex__", nb_hex, slot_nb_hex, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4968 "hex(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4969 IBSLOT("__iadd__", nb_inplace_add, slot_nb_inplace_add,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4970 wrap_binaryfunc, "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4971 IBSLOT("__isub__", nb_inplace_subtract, slot_nb_inplace_subtract,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4972 wrap_binaryfunc, "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4973 IBSLOT("__imul__", nb_inplace_multiply, slot_nb_inplace_multiply,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4974 wrap_binaryfunc, "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4975 IBSLOT("__idiv__", nb_inplace_divide, slot_nb_inplace_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4976 wrap_binaryfunc, "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4977 IBSLOT("__imod__", nb_inplace_remainder, slot_nb_inplace_remainder,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4978 wrap_binaryfunc, "%"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4979 IBSLOT("__ipow__", nb_inplace_power, slot_nb_inplace_power,
25794 001b789f1f84 For some reason (probably cut and paste), __ipow__ for new-style Guido van Rossum <guido@python.org> parents: 25793 diff changeset	4980 wrap_binaryfunc, "**"),
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4981 IBSLOT("__ilshift__", nb_inplace_lshift, slot_nb_inplace_lshift,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4982 wrap_binaryfunc, "<<"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4983 IBSLOT("__irshift__", nb_inplace_rshift, slot_nb_inplace_rshift,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4984 wrap_binaryfunc, ">>"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4985 IBSLOT("__iand__", nb_inplace_and, slot_nb_inplace_and,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4986 wrap_binaryfunc, "&"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4987 IBSLOT("__ixor__", nb_inplace_xor, slot_nb_inplace_xor,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4988 wrap_binaryfunc, "^"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4989 IBSLOT("__ior__", nb_inplace_or, slot_nb_inplace_or,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4990 wrap_binaryfunc, "\|"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4991 BINSLOT("__floordiv__", nb_floor_divide, slot_nb_floor_divide, "//"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4992 RBINSLOT("__rfloordiv__", nb_floor_divide, slot_nb_floor_divide, "//"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4993 BINSLOT("__truediv__", nb_true_divide, slot_nb_true_divide, "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4994 RBINSLOT("__rtruediv__", nb_true_divide, slot_nb_true_divide, "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4995 IBSLOT("__ifloordiv__", nb_inplace_floor_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4996 slot_nb_inplace_floor_divide, wrap_binaryfunc, "//"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4997 IBSLOT("__itruediv__", nb_inplace_true_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4998 slot_nb_inplace_true_divide, wrap_binaryfunc, "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4999
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5000 TPSLOT("__str__", tp_str, slot_tp_str, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5001 "x.__str__() <==> str(x)"),
20737 00a581bdedeb When overriding __str__ or __repr__, set the tp_print slot to NULL. Guido van Rossum <guido@python.org> parents: 20725 diff changeset	5002 TPSLOT("__str__", tp_print, NULL, NULL, ""),
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5003 TPSLOT("__repr__", tp_repr, slot_tp_repr, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5004 "x.__repr__() <==> repr(x)"),
20737 00a581bdedeb When overriding __str__ or __repr__, set the tp_print slot to NULL. Guido van Rossum <guido@python.org> parents: 20725 diff changeset	5005 TPSLOT("__repr__", tp_print, NULL, NULL, ""),
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5006 TPSLOT("__cmp__", tp_compare, _PyObject_SlotCompare, wrap_cmpfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5007 "x.__cmp__(y) <==> cmp(x,y)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5008 TPSLOT("__hash__", tp_hash, slot_tp_hash, wrap_hashfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5009 "x.__hash__() <==> hash(x)"),
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	5010 FLSLOT("__call__", tp_call, slot_tp_call, (wrapperfunc)wrap_call,
ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	5011 "x.__call__(...) <==> x(...)", PyWrapperFlag_KEYWORDS),
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5012 TPSLOT("__getattribute__", tp_getattro, slot_tp_getattr_hook,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5013 wrap_binaryfunc, "x.__getattribute__('name') <==> x.name"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5014 TPSLOT("__getattribute__", tp_getattr, NULL, NULL, ""),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5015 TPSLOT("__getattr__", tp_getattro, slot_tp_getattr_hook, NULL, ""),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5016 TPSLOT("__getattr__", tp_getattr, NULL, NULL, ""),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5017 TPSLOT("__setattr__", tp_setattro, slot_tp_setattro, wrap_setattr,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5018 "x.__setattr__('name', value) <==> x.name = value"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5019 TPSLOT("__setattr__", tp_setattr, NULL, NULL, ""),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5020 TPSLOT("__delattr__", tp_setattro, slot_tp_setattro, wrap_delattr,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5021 "x.__delattr__('name') <==> del x.name"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5022 TPSLOT("__delattr__", tp_setattr, NULL, NULL, ""),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5023 TPSLOT("__lt__", tp_richcompare, slot_tp_richcompare, richcmp_lt,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5024 "x.__lt__(y) <==> x<y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5025 TPSLOT("__le__", tp_richcompare, slot_tp_richcompare, richcmp_le,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5026 "x.__le__(y) <==> x<=y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5027 TPSLOT("__eq__", tp_richcompare, slot_tp_richcompare, richcmp_eq,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5028 "x.__eq__(y) <==> x==y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5029 TPSLOT("__ne__", tp_richcompare, slot_tp_richcompare, richcmp_ne,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5030 "x.__ne__(y) <==> x!=y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5031 TPSLOT("__gt__", tp_richcompare, slot_tp_richcompare, richcmp_gt,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5032 "x.__gt__(y) <==> x>y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5033 TPSLOT("__ge__", tp_richcompare, slot_tp_richcompare, richcmp_ge,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5034 "x.__ge__(y) <==> x>=y"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5035 TPSLOT("__iter__", tp_iter, slot_tp_iter, wrap_unaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5036 "x.__iter__() <==> iter(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5037 TPSLOT("next", tp_iternext, slot_tp_iternext, wrap_next,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5038 "x.next() -> the next value, or raise StopIteration"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5039 TPSLOT("__get__", tp_descr_get, slot_tp_descr_get, wrap_descr_get,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5040 "descr.__get__(obj[, type]) -> value"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5041 TPSLOT("__set__", tp_descr_set, slot_tp_descr_set, wrap_descr_set,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5042 "descr.__set__(obj, value)"),
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	5043 TPSLOT("__delete__", tp_descr_set, slot_tp_descr_set,
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	5044 wrap_descr_delete, "descr.__delete__(obj)"),
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	5045 FLSLOT("__init__", tp_init, slot_tp_init, (wrapperfunc)wrap_init,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5046 "x.__init__(...) initializes x; "
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	5047 "see x.__class__.__doc__ for signature",
ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	5048 PyWrapperFlag_KEYWORDS),
ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	5049 TPSLOT("__new__", tp_new, slot_tp_new, NULL, ""),
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5050 TPSLOT("__del__", tp_del, slot_tp_del, NULL, ""),
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5051 {NULL}
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5052 };
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5053
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5054 /* Given a type pointer and an offset gotten from a slotdef entry, return a
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5055 pointer to the actual slot. This is not quite the same as simply adding
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5056 the offset to the type pointer, since it takes care to indirect through the
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5057 proper indirection pointer (as_buffer, etc.); it returns NULL if the
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5058 indirection pointer is NULL. */
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5059 static void **
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5060 slotptr(PyTypeObject *type, int offset)
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5061 {
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5062 char *ptr;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5063
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5064 /* Note: this depends on the order of the members of PyHeapTypeObject! */
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5065 assert(offset >= 0);
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5066 assert(offset < offsetof(PyHeapTypeObject, as_buffer));
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5067 if (offset >= offsetof(PyHeapTypeObject, as_sequence)) {
23830 ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5068 ptr = (void *)type->tp_as_sequence;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5069 offset -= offsetof(PyHeapTypeObject, as_sequence);
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5070 }
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5071 else if (offset >= offsetof(PyHeapTypeObject, as_mapping)) {
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5072 ptr = (void *)type->tp_as_mapping;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5073 offset -= offsetof(PyHeapTypeObject, as_mapping);
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5074 }
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5075 else if (offset >= offsetof(PyHeapTypeObject, as_number)) {
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5076 ptr = (void *)type->tp_as_number;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5077 offset -= offsetof(PyHeapTypeObject, as_number);
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5078 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5079 else {
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5080 ptr = (void *)type;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5081 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5082 if (ptr != NULL)
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5083 ptr += offset;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5084 return (void **)ptr;
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5085 }
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	5086
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5087 /* Length of array of slotdef pointers used to store slots with the
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5088 same __name__. There should be at most MAX_EQUIV-1 slotdef entries with
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5089 the same __name__, for any __name__. Since that's a static property, it is
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5090 appropriate to declare fixed-size arrays for this. */
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5091 #define MAX_EQUIV 10
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5092
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5093 /* Return a slot pointer for a given name, but ONLY if the attribute has
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5094 exactly one slot function. The name must be an interned string. */
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5095 static void **
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5096 resolve_slotdups(PyTypeObject type, PyObject name)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5097 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5098 /* XXX Maybe this could be optimized more -- but is it worth it? */
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5099
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5100 /* pname and ptrs act as a little cache */
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5101 static PyObject *pname;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5102 static slotdef *ptrs[MAX_EQUIV];
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5103 slotdef p, *pp;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5104 void res, ptr;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5105
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5106 if (pname != name) {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5107 /* Collect all slotdefs that match name into ptrs. */
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5108 pname = name;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5109 pp = ptrs;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5110 for (p = slotdefs; p->name_strobj; p++) {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5111 if (p->name_strobj == name)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5112 *pp++ = p;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5113 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5114 *pp = NULL;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5115 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5116
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5117 /* Look in all matching slots of the type; if exactly one of these has
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5118 a filled-in slot, return its value. Otherwise return NULL. */
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5119 res = NULL;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5120 for (pp = ptrs; *pp; pp++) {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5121 ptr = slotptr(type, (*pp)->offset);
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5122 if (ptr == NULL \|\| *ptr == NULL)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5123 continue;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5124 if (res != NULL)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5125 return NULL;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5126 res = ptr;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5127 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5128 return res;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5129 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5130
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5131 /* Common code for update_slots_callback() and fixup_slot_dispatchers(). This
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5132 does some incredibly complex thinking and then sticks something into the
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5133 slot. (It sees if the adjacent slotdefs for the same slot have conflicting
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5134 interests, and then stores a generic wrapper or a specific function into
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5135 the slot.) Return a pointer to the next slotdef with a different offset,
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5136 because that's convenient for fixup_slot_dispatchers(). */
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5137 static slotdef *
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5138 update_one_slot(PyTypeObject type, slotdef p)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5139 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5140 PyObject *descr;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5141 PyWrapperDescrObject *d;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5142 void generic = NULL, specific = NULL;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5143 int use_generic = 0;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5144 int offset = p->offset;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5145 void **ptr = slotptr(type, offset);
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5146
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5147 if (ptr == NULL) {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5148 do {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5149 ++p;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5150 } while (p->offset == offset);
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5151 return p;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5152 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5153 do {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5154 descr = _PyType_Lookup(type, p->name_strobj);
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5155 if (descr == NULL)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5156 continue;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5157 if (descr->ob_type == &PyWrapperDescr_Type) {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5158 void **tptr = resolve_slotdups(type, p->name_strobj);
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5159 if (tptr == NULL \|\| tptr == ptr)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5160 generic = p->function;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5161 d = (PyWrapperDescrObject *)descr;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5162 if (d->d_base->wrapper == p->wrapper &&
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5163 PyType_IsSubtype(type, d->d_type))
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5164 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5165 if (specific == NULL \|\|
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5166 specific == d->d_wrapped)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5167 specific = d->d_wrapped;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5168 else
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5169 use_generic = 1;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5170 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5171 }
24685 36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5172 else if (descr->ob_type == &PyCFunction_Type &&
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5173 PyCFunction_GET_FUNCTION(descr) ==
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5174 (PyCFunction)tp_new_wrapper &&
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5175 strcmp(p->name, "__new__") == 0)
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5176 {
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5177 /* The __new__ wrapper is not a wrapper descriptor,
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5178 so must be special-cased differently.
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5179 If we don't do this, creating an instance will
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5180 always use slot_tp_new which will look up
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5181 __new__ in the MRO which will call tp_new_wrapper
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5182 which will look through the base classes looking
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5183 for a static base and call its tp_new (usually
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5184 PyType_GenericNew), after performing various
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5185 sanity checks and constructing a new argument
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5186 list. Cut all that nonsense short -- this speeds
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5187 up instance creation tremendously. */
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 28737 diff changeset	5188 specific = (void *)type->tp_new;
24685 36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5189 /* XXX I'm not 100% sure that there isn't a hole
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5190 in this reasoning that requires additional
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5191 sanity checks. I'll buy the first person to
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5192 point out a bug in this reasoning a beer. */
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5193 }
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5194 else {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5195 use_generic = 1;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5196 generic = p->function;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5197 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5198 } while ((++p)->offset == offset);
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5199 if (specific && !use_generic)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5200 *ptr = specific;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5201 else
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5202 *ptr = generic;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5203 return p;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5204 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5205
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5206 /* In the type, update the slots whose slotdefs are gathered in the pp array.
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5207 This is a callback for update_subclasses(). */
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5208 static int
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5209 update_slots_callback(PyTypeObject type, void data)
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5210 {
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5211 slotdef pp = (slotdef )data;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5212
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5213 for (; *pp; pp++)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5214 update_one_slot(type, *pp);
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5215 return 0;
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5216 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5217
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5218 /* Comparison function for qsort() to compare slotdefs by their offset, and
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5219 for equal offset by their address (to force a stable sort). */
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5220 static int
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5221 slotdef_cmp(const void aa, const void bb)
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5222 {
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5223 const slotdef a = (const slotdef )aa, b = (const slotdef )bb;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5224 int c = a->offset - b->offset;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5225 if (c != 0)
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5226 return c;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5227 else
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5228 return a - b;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5229 }
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5230
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5231 /* Initialize the slotdefs table by adding interned string objects for the
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5232 names and sorting the entries. */
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5233 static void
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5234 init_slotdefs(void)
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5235 {
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5236 slotdef *p;
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5237 static int initialized = 0;
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5238
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5239 if (initialized)
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5240 return;
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5241 for (p = slotdefs; p->name; p++) {
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5242 p->name_strobj = PyString_InternFromString(p->name);
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5243 if (!p->name_strobj)
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5244 Py_FatalError("Out of memory interning slotdef names");
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5245 }
20457 4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5246 qsort((void *)slotdefs, (size_t)(p-slotdefs), sizeof(slotdef),
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5247 slotdef_cmp);
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5248 initialized = 1;
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5249 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5250
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5251 /* Update the slots after assignment to a class (type) attribute. */
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5252 static int
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5253 update_slot(PyTypeObject type, PyObject name)
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5254 {
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5255 slotdef *ptrs[MAX_EQUIV];
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5256 slotdef *p;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5257 slotdef **pp;
20457 4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5258 int offset;
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5259
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5260 init_slotdefs();
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5261 pp = ptrs;
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5262 for (p = slotdefs; p->name; p++) {
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5263 /* XXX assume name is interned! */
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5264 if (p->name_strobj == name)
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5265 *pp++ = p;
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5266 }
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5267 *pp = NULL;
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5268 for (pp = ptrs; *pp; pp++) {
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5269 p = *pp;
20457 4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5270 offset = p->offset;
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5271 while (p > slotdefs && (p-1)->offset == offset)
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5272 --p;
20457 4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5273 *pp = p;
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5274 }
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5275 if (ptrs[0] == NULL)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5276 return 0; /* Not an attribute that affects any slots */
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5277 return update_subclasses(type, name,
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5278 update_slots_callback, (void *)ptrs);
20382 be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5279 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5280
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5281 /* Store the proper functions in the slot dispatches at class (type)
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5282 definition time, based upon which operations the class overrides in its
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5283 dict. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5284 static void
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5285 fixup_slot_dispatchers(PyTypeObject *type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5286 {
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5287 slotdef *p;
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5288
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5289 init_slotdefs();
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5290 for (p = slotdefs; p->name; )
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5291 p = update_one_slot(type, p);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5292 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5293
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5294 static void
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5295 update_all_slots(PyTypeObject* type)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5296 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5297 slotdef *p;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5298
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5299 init_slotdefs();
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5300 for (p = slotdefs; p->name; p++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5301 /* update_slot returns int but can't actually fail */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5302 update_slot(type, p->name_strobj);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5303 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5304 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5305
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5306 /* recurse_down_subclasses() and update_subclasses() are mutually
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5307 recursive functions to call a callback for all subclasses,
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5308 but refraining from recursing into subclasses that define 'name'. */
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5309
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5310 static int
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5311 update_subclasses(PyTypeObject type, PyObject name,
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5312 update_callback callback, void *data)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5313 {
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5314 if (callback(type, data) < 0)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5315 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5316 return recurse_down_subclasses(type, name, callback, data);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5317 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5318
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5319 static int
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5320 recurse_down_subclasses(PyTypeObject type, PyObject name,
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5321 update_callback callback, void *data)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5322 {
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5323 PyTypeObject *subclass;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5324 PyObject ref, subclasses, *dict;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5325 int i, n;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5326
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5327 subclasses = type->tp_subclasses;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5328 if (subclasses == NULL)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5329 return 0;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5330 assert(PyList_Check(subclasses));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5331 n = PyList_GET_SIZE(subclasses);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5332 for (i = 0; i < n; i++) {
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5333 ref = PyList_GET_ITEM(subclasses, i);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5334 assert(PyWeakref_CheckRef(ref));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5335 subclass = (PyTypeObject *)PyWeakref_GET_OBJECT(ref);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5336 assert(subclass != NULL);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5337 if ((PyObject *)subclass == Py_None)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5338 continue;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5339 assert(PyType_Check(subclass));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5340 /* Avoid recursing down into unaffected classes */
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5341 dict = subclass->tp_dict;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5342 if (dict != NULL && PyDict_Check(dict) &&
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5343 PyDict_GetItem(dict, name) != NULL)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5344 continue;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5345 if (update_subclasses(subclass, name, callback, data) < 0)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5346 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5347 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5348 return 0;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5349 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5350
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5351 /* This function is called by PyType_Ready() to populate the type's
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5352 dictionary with method descriptors for function slots. For each
23830 ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5353 function slot (like tp_repr) that's defined in the type, one or more
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5354 corresponding descriptors are added in the type's tp_dict dictionary
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5355 under the appropriate name (like __repr__). Some function slots
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5356 cause more than one descriptor to be added (for example, the nb_add
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5357 slot adds both __add__ and __radd__ descriptors) and some function
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5358 slots compete for the same descriptor (for example both sq_item and
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5359 mp_subscript generate a __getitem__ descriptor).
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5360
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5361 In the latter case, the first slotdef entry encoutered wins. Since
28390 33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	5362 slotdef entries are sorted by the offset of the slot in the
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5363 PyHeapTypeObject, this gives us some control over disambiguating
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5364 between competing slots: the members of PyHeapTypeObject are listed
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5365 from most general to least general, so the most general slot is
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5366 preferred. In particular, because as_mapping comes before as_sequence,
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5367 for a type that defines both mp_subscript and sq_item, mp_subscript
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5368 wins.
23830 ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5369
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5370 This only adds new descriptors and doesn't overwrite entries in
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5371 tp_dict that were previously defined. The descriptors contain a
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5372 reference to the C function they must call, so that it's safe if they
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5373 are copied into a subtype's __dict__ and the subtype has a different
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5374 C function in its slot -- calling the method defined by the
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5375 descriptor will call the C function that was used to create it,
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5376 rather than the C function present in the slot when it is called.
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5377 (This is important because a subtype may have a C function in the
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5378 slot that calls the method from the dictionary, and we want to avoid
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5379 infinite recursion here.) */
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5380
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5381 static int
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5382 add_operators(PyTypeObject *type)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5383 {
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5384 PyObject *dict = type->tp_dict;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5385 slotdef *p;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5386 PyObject *descr;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5387 void **ptr;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5388
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5389 init_slotdefs();
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5390 for (p = slotdefs; p->name; p++) {
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5391 if (p->wrapper == NULL)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5392 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5393 ptr = slotptr(type, p->offset);
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5394 if (!ptr \|\| !*ptr)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5395 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5396 if (PyDict_GetItem(dict, p->name_strobj))
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5397 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5398 descr = PyDescr_NewWrapper(type, p, *ptr);
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5399 if (descr == NULL)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5400 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5401 if (PyDict_SetItem(dict, p->name_strobj, descr) < 0)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5402 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5403 Py_DECREF(descr);
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5404 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5405 if (type->tp_new != NULL) {
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5406 if (add_tp_new_wrapper(type) < 0)
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5407 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5408 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5409 return 0;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5410 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5411
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5412
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5413 /* Cooperative 'super' */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5414
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5415 typedef struct {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5416 PyObject_HEAD
19551 01a6901cd305 Fix super() so that it is usable for static methods (like __new__) as well. Guido van Rossum <guido@python.org> parents: 19540 diff changeset	5417 PyTypeObject *type;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5418 PyObject *obj;
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5419 PyTypeObject *obj_type;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5420 } superobject;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5421
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5422 static PyMemberDef super_members[] = {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5423 {"__thisclass__", T_OBJECT, offsetof(superobject, type), READONLY,
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5424 "the class invoking super()"},
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5425 {"__self__", T_OBJECT, offsetof(superobject, obj), READONLY,
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5426 "the instance invoking super(); may be None"},
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5427 {"__self_class__", T_OBJECT, offsetof(superobject, obj_type), READONLY,
30723 6f15e73b59f2 Backport checkin: Walter Dörwald <walter@livinglogic.de> parents: 30685 diff changeset	5428 "the type of the instance invoking super(); may be None"},
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5429 {0}
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5430 };
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5431
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5432 static void
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5433 super_dealloc(PyObject *self)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5434 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5435 superobject su = (superobject )self;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5436
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5437 _PyObject_GC_UNTRACK(self);
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5438 Py_XDECREF(su->obj);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5439 Py_XDECREF(su->type);
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5440 Py_XDECREF(su->obj_type);
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5441 self->ob_type->tp_free(self);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5442 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5443
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5444 static PyObject *
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5445 super_repr(PyObject *self)
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5446 {
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5447 superobject su = (superobject )self;
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5448
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5449 if (su->obj_type)
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5450 return PyString_FromFormat(
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	5451 "<super: <class '%s'>, <%s object>>",
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5452 su->type ? su->type->tp_name : "NULL",
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5453 su->obj_type->tp_name);
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5454 else
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5455 return PyString_FromFormat(
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	5456 "<super: <class '%s'>, NULL>",
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5457 su->type ? su->type->tp_name : "NULL");
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5458 }
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5459
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5460 static PyObject *
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5461 super_getattro(PyObject self, PyObject name)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5462 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5463 superobject su = (superobject )self;
28638 9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5464 int skip = su->obj_type == NULL;
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5465
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5466 if (!skip) {
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5467 /* We want __class__ to return the class of the super object
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5468 (i.e. super, or a subclass), not the class of su->obj. */
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5469 skip = (PyString_Check(name) &&
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5470 PyString_GET_SIZE(name) == 9 &&
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5471 strcmp(PyString_AS_STRING(name), "__class__") == 0);
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5472 }
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5473
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5474 if (!skip) {
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5475 PyObject mro, res, tmp, dict;
22770 314e1416aa5d SF patch 537536 by Phillip J. Eby, fix for SF bug 535444, super() Guido van Rossum <guido@python.org> parents: 22713 diff changeset	5476 PyTypeObject *starttype;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5477 descrgetfunc f;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5478 int i, n;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5479
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5480 starttype = su->obj_type;
22770 314e1416aa5d SF patch 537536 by Phillip J. Eby, fix for SF bug 535444, super() Guido van Rossum <guido@python.org> parents: 22713 diff changeset	5481 mro = starttype->tp_mro;
314e1416aa5d SF patch 537536 by Phillip J. Eby, fix for SF bug 535444, super() Guido van Rossum <guido@python.org> parents: 22713 diff changeset	5482
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5483 if (mro == NULL)
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5484 n = 0;
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5485 else {
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5486 assert(PyTuple_Check(mro));
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5487 n = PyTuple_GET_SIZE(mro);
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5488 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5489 for (i = 0; i < n; i++) {
19551 01a6901cd305 Fix super() so that it is usable for static methods (like __new__) as well. Guido van Rossum <guido@python.org> parents: 19540 diff changeset	5490 if ((PyObject *)(su->type) == PyTuple_GET_ITEM(mro, i))
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5491 break;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5492 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5493 i++;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5494 res = NULL;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5495 for (; i < n; i++) {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5496 tmp = PyTuple_GET_ITEM(mro, i);
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5497 if (PyType_Check(tmp))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5498 dict = ((PyTypeObject *)tmp)->tp_dict;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5499 else if (PyClass_Check(tmp))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5500 dict = ((PyClassObject *)tmp)->cl_dict;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5501 else
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5502 continue;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5503 res = PyDict_GetItem(dict, name);
28640 4824aab12549 Sigh. The crucial change was still missing from the previous Guido van Rossum <guido@python.org> parents: 28638 diff changeset	5504 if (res != NULL) {
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5505 Py_INCREF(res);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5506 f = res->ob_type->tp_descr_get;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5507 if (f != NULL) {
31801 277b5a2f08f5 Ensure super() lookup of descriptor from classmethod works (SF ID# 743627) Phillip J. Eby <pje@telecommunity.com> parents: 31494 diff changeset	5508 tmp = f(res,
277b5a2f08f5 Ensure super() lookup of descriptor from classmethod works (SF ID# 743627) Phillip J. Eby <pje@telecommunity.com> parents: 31494 diff changeset	5509 /* Only pass 'obj' param if
277b5a2f08f5 Ensure super() lookup of descriptor from classmethod works (SF ID# 743627) Phillip J. Eby <pje@telecommunity.com> parents: 31494 diff changeset	5510 this is instance-mode super
277b5a2f08f5 Ensure super() lookup of descriptor from classmethod works (SF ID# 743627) Phillip J. Eby <pje@telecommunity.com> parents: 31494 diff changeset	5511 (See SF ID #743627)
277b5a2f08f5 Ensure super() lookup of descriptor from classmethod works (SF ID# 743627) Phillip J. Eby <pje@telecommunity.com> parents: 31494 diff changeset	5512 */
32058 f63dd299a60b super_getattro(): Repaired compiler warning about mixed-type comparison. Tim Peters <tim.peters@gmail.com> parents: 31801 diff changeset	5513 (su->obj ==
f63dd299a60b super_getattro(): Repaired compiler warning about mixed-type comparison. Tim Peters <tim.peters@gmail.com> parents: 31801 diff changeset	5514 (PyObject *)su->obj_type
31801 277b5a2f08f5 Ensure super() lookup of descriptor from classmethod works (SF ID# 743627) Phillip J. Eby <pje@telecommunity.com> parents: 31494 diff changeset	5515 ? (PyObject *)NULL
277b5a2f08f5 Ensure super() lookup of descriptor from classmethod works (SF ID# 743627) Phillip J. Eby <pje@telecommunity.com> parents: 31494 diff changeset	5516 : su->obj),
22774 02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	5517 (PyObject *)starttype);
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5518 Py_DECREF(res);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5519 res = tmp;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5520 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5521 return res;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5522 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5523 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5524 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5525 return PyObject_GenericGetAttr(self, name);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5526 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5527
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5528 static PyTypeObject *
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5529 supercheck(PyTypeObject type, PyObject obj)
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5530 {
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5531 /* Check that a super() call makes sense. Return a type object.
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5532
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5533 obj can be a new-style class, or an instance of one:
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5534
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5535 - If it is a class, it must be a subclass of 'type'. This case is
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5536 used for class methods; the return value is obj.
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5537
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5538 - If it is an instance, it must be an instance of 'type'. This is
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5539 the normal case; the return value is obj.__class__.
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5540
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5541 But... when obj is an instance, we want to allow for the case where
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5542 obj->ob_type is not a subclass of type, but obj.__class__ is!
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5543 This will allow using super() with a proxy for obj.
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5544 */
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5545
27942 9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5546 /* Check for first bullet above (special case) */
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5547 if (PyType_Check(obj) && PyType_IsSubtype((PyTypeObject *)obj, type)) {
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5548 Py_INCREF(obj);
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5549 return (PyTypeObject *)obj;
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5550 }
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5551
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5552 /* Normal case */
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5553 if (PyType_IsSubtype(obj->ob_type, type)) {
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5554 Py_INCREF(obj->ob_type);
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5555 return obj->ob_type;
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5556 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5557 else {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5558 /* Try the slow way */
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5559 static PyObject *class_str = NULL;
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5560 PyObject *class_attr;
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5561
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5562 if (class_str == NULL) {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5563 class_str = PyString_FromString("__class__");
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5564 if (class_str == NULL)
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5565 return NULL;
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5566 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5567
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5568 class_attr = PyObject_GetAttr(obj, class_str);
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5569
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5570 if (class_attr != NULL &&
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5571 PyType_Check(class_attr) &&
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5572 (PyTypeObject *)class_attr != obj->ob_type)
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5573 {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5574 int ok = PyType_IsSubtype(
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5575 (PyTypeObject *)class_attr, type);
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5576 if (ok)
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5577 return (PyTypeObject *)class_attr;
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5578 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5579
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5580 if (class_attr == NULL)
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5581 PyErr_Clear();
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5582 else
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5583 Py_DECREF(class_attr);
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5584 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5585
27943 3b30f66362be Removed unreferenced label. Tim Peters <tim.peters@gmail.com> parents: 27942 diff changeset	5586 PyErr_SetString(PyExc_TypeError,
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5587 "super(type, obj): "
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5588 "obj must be an instance or subtype of type");
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5589 return NULL;
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5590 }
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5591
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5592 static PyObject *
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5593 super_descr_get(PyObject self, PyObject obj, PyObject *type)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5594 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5595 superobject su = (superobject )self;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5596 superobject *new;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5597
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5598 if (obj == NULL \|\| obj == Py_None \|\| su->obj != NULL) {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5599 /* Not binding to an object, or already bound */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5600 Py_INCREF(self);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5601 return self;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5602 }
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5603 if (su->ob_type != &PySuper_Type)
29408 31b2cba64b39 Fixed a comment. Brett Cannon <bcannon@gmail.com> parents: 29382 diff changeset	5604 /* If su is not an instance of a subclass of super,
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5605 call its type */
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5606 return PyObject_CallFunction((PyObject *)su->ob_type,
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5607 "OO", su->type, obj);
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5608 else {
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5609 /* Inline the common case */
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5610 PyTypeObject *obj_type = supercheck(su->type, obj);
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5611 if (obj_type == NULL)
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5612 return NULL;
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5613 new = (superobject *)PySuper_Type.tp_new(&PySuper_Type,
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5614 NULL, NULL);
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5615 if (new == NULL)
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5616 return NULL;
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5617 Py_INCREF(su->type);
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5618 Py_INCREF(obj);
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5619 new->type = su->type;
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5620 new->obj = obj;
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5621 new->obj_type = obj_type;
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5622 return (PyObject *)new;
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5623 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5624 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5625
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5626 static int
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5627 super_init(PyObject self, PyObject args, PyObject *kwds)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5628 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5629 superobject su = (superobject )self;
19551 01a6901cd305 Fix super() so that it is usable for static methods (like __new__) as well. Guido van Rossum <guido@python.org> parents: 19540 diff changeset	5630 PyTypeObject *type;
01a6901cd305 Fix super() so that it is usable for static methods (like __new__) as well. Guido van Rossum <guido@python.org> parents: 19540 diff changeset	5631 PyObject *obj = NULL;
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5632 PyTypeObject *obj_type = NULL;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5633
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5634 if (!PyArg_ParseTuple(args, "O!\|O:super", &PyType_Type, &type, &obj))
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5635 return -1;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5636 if (obj == Py_None)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5637 obj = NULL;
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5638 if (obj != NULL) {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5639 obj_type = supercheck(type, obj);
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5640 if (obj_type == NULL)
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5641 return -1;
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5642 Py_INCREF(obj);
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5643 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5644 Py_INCREF(type);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5645 su->type = type;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5646 su->obj = obj;
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5647 su->obj_type = obj_type;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5648 return 0;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5649 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5650
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	5651 PyDoc_STRVAR(super_doc,
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5652 "super(type) -> unbound super object\n"
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5653 "super(type, obj) -> bound super object; requires isinstance(obj, type)\n"
19551 01a6901cd305 Fix super() so that it is usable for static methods (like __new__) as well. Guido van Rossum <guido@python.org> parents: 19540 diff changeset	5654 "super(type, type2) -> bound super object; requires issubclass(type2, type)\n"
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5655 "Typical use to call a cooperative superclass method:\n"
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5656 "class C(B):\n"
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5657 " def meth(self, arg):\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	5658 " super(C, self).meth(arg)");
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5659
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5660 static int
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5661 super_traverse(PyObject self, visitproc visit, void arg)
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5662 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5663 superobject su = (superobject )self;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5664 int err;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5665
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5666 #define VISIT(SLOT) \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5667 if (SLOT) { \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5668 err = visit((PyObject *)(SLOT), arg); \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5669 if (err) \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5670 return err; \
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5671 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5672
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5673 VISIT(su->obj);
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5674 VISIT(su->type);
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5675 VISIT(su->obj_type);
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5676
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5677 #undef VISIT
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5678
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5679 return 0;
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5680 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5681
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5682 PyTypeObject PySuper_Type = {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5683 PyObject_HEAD_INIT(&PyType_Type)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5684 0, /* ob_size */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5685 "super", /* tp_name */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5686 sizeof(superobject), /* tp_basicsize */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5687 0, /* tp_itemsize */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5688 /* methods */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5689 super_dealloc, /* tp_dealloc */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5690 0, /* tp_print */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5691 0, /* tp_getattr */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5692 0, /* tp_setattr */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5693 0, /* tp_compare */
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5694 super_repr, /* tp_repr */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5695 0, /* tp_as_number */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5696 0, /* tp_as_sequence */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5697 0, /* tp_as_mapping */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5698 0, /* tp_hash */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5699 0, /* tp_call */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5700 0, /* tp_str */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5701 super_getattro, /* tp_getattro */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5702 0, /* tp_setattro */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5703 0, /* tp_as_buffer */
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5704 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5705 Py_TPFLAGS_BASETYPE, /* tp_flags */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5706 super_doc, /* tp_doc */
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5707 super_traverse, /* tp_traverse */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5708 0, /* tp_clear */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5709 0, /* tp_richcompare */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5710 0, /* tp_weaklistoffset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5711 0, /* tp_iter */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5712 0, /* tp_iternext */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5713 0, /* tp_methods */
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5714 super_members, /* tp_members */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5715 0, /* tp_getset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5716 0, /* tp_base */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5717 0, /* tp_dict */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5718 super_descr_get, /* tp_descr_get */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5719 0, /* tp_descr_set */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5720 0, /* tp_dictoffset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5721 super_init, /* tp_init */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5722 PyType_GenericAlloc, /* tp_alloc */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5723 PyType_GenericNew, /* tp_new */
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	5724 PyObject_GC_Del, /* tp_free */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5725 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/typeobject.c @ 33091:48100a01ac7c 2.3