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

annotate Objects/typeobject.c @ 40382:d75b0caa67db

The rest of patch 1549670 by Jiwon, making the compiler test pass. This removes some bogus debug stuff Jiwon accidentally left in last time.

author	Guido van Rossum <guido@python.org>
date	Wed, 22 Nov 2006 04:55:53 +0000
parents	aa59466ebd9c
children	88133417dfd0

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 {
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	24 const char *s;
19300 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
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	29 Py_INCREF(et->ht_name);
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	30 return et->ht_name;
26448 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
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	74 Py_DECREF(et->ht_name);
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	75 et->ht_name = value;
26421 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__");
32323 c1fbbc3eed39 Fix for bug #966623 - classes created with type() in an exec(, {}) don't Anthony Baxter <anthonybaxter@gmail.com> parents: 31813 diff changeset	90 if (!mod) {
c1fbbc3eed39 Fix for bug #966623 - classes created with type() in an exec(, {}) don't Anthony Baxter <anthonybaxter@gmail.com> parents: 31813 diff changeset	91 PyErr_Format(PyExc_AttributeError, "__module__");
c1fbbc3eed39 Fix for bug #966623 - classes created with type() in an exec(, {}) don't Anthony Baxter <anthonybaxter@gmail.com> parents: 31813 diff changeset	92 return 0;
c1fbbc3eed39 Fix for bug #966623 - classes created with type() in an exec(, {}) don't Anthony Baxter <anthonybaxter@gmail.com> parents: 31813 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;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	148 Py_ssize_t 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;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	170 tuple = PyTuple_Pack(2, 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 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	187 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	188 int r = 0;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	189 PyObject ob, temp;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	190 PyTypeObject new_base, old_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	191 PyObject old_bases, old_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	192
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	193 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	194 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	195 "can't set %s.__bases__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	196 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	197 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	198 if (!value) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	199 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	200 "can't delete %s.__bases__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	201 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	202 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	203 if (!PyTuple_Check(value)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	204 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	205 "can only assign tuple to %s.__bases__, not %s",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	206 type->tp_name, value->ob_type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	207 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	208 }
26645 d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	209 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	210 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	211 "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	212 type->tp_name);
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	213 return -1;
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	214 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	215 for (i = 0; i < PyTuple_GET_SIZE(value); i++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	216 ob = PyTuple_GET_ITEM(value, i);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	217 if (!PyType_Check(ob)) {
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	218 PyErr_Format(
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	219 PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	220 "%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	221 type->tp_name, ob->ob_type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	222 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	223 }
26440 aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	224 if (PyType_Check(ob)) {
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	225 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	226 PyErr_SetString(PyExc_TypeError,
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	227 "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	228 return -1;
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	229 }
26421 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
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	233 new_base = best_base(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	234
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	235 if (!new_base) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	236 return -1;
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
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	239 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	240 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	241
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	242 Py_INCREF(new_base);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	243 Py_INCREF(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	244
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	245 old_bases = type->tp_bases;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	246 old_base = type->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	247 old_mro = type->tp_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	248
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	249 type->tp_bases = value;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	250 type->tp_base = new_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	251
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	252 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	253 goto bail;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	254 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	255
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	256 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	257 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	258 goto bail;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	259
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	260 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	261
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	262 if (r < 0) {
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	263 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	264 PyTypeObject* cls;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	265 PyObject* mro;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	266 PyArg_UnpackTuple(PyList_GET_ITEM(temp, i),
3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	267 "", 2, 2, &cls, &mro);
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	268 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	269 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	270 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	271 }
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	272 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	273 goto bail;
26445 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
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	276 Py_DECREF(temp);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	277
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	278 /* any base that was in __bases__ but now isn't, we
26660 f838bc9056cc Punctuation fix. Raymond Hettinger <python@rcn.com> parents: 26645 diff changeset	279 need to remove \|type\| from its tp_subclasses.
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	280 conversely, any class now in __bases__ that wasn't
26660 f838bc9056cc Punctuation fix. Raymond Hettinger <python@rcn.com> parents: 26645 diff changeset	281 needs to have \|type\| added to its subclasses. */
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	282
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	283 /* 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	284 add to all new_bases */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	285
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	286 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	287 ob = PyTuple_GET_ITEM(old_bases, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	288 if (PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	289 remove_subclass(
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	290 (PyTypeObject*)ob, type);
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
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	294 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	295 ob = PyTuple_GET_ITEM(value, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	296 if (PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	297 if (add_subclass((PyTypeObject*)ob, type) < 0)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	298 r = -1;
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
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	302 update_all_slots(type);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	303
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	304 Py_DECREF(old_bases);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	305 Py_DECREF(old_base);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	306 Py_DECREF(old_mro);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	307
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	308 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	309
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	310 bail:
30084 d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	311 Py_DECREF(type->tp_bases);
d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	312 Py_DECREF(type->tp_base);
d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	313 if (type->tp_mro != old_mro) {
d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	314 Py_DECREF(type->tp_mro);
d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	315 }
d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	316
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	317 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	318 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	319 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	320
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	321 return -1;
26421 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
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	324 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	325 type_dict(PyTypeObject type, void context)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	326 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	327 if (type->tp_dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	328 Py_INCREF(Py_None);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	329 return Py_None;
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	330 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	331 return PyDictProxy_New(type->tp_dict);
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	332 }
c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	333
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	334 static PyObject *
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	335 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	336 {
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	337 PyObject *result;
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	338 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	339 return PyString_FromString(type->tp_doc);
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	340 result = PyDict_GetItemString(type->tp_dict, "__doc__");
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	341 if (result == NULL) {
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	342 result = Py_None;
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	343 Py_INCREF(result);
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	344 }
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	345 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	346 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	347 (PyObject *)type);
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	348 }
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	349 else {
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	350 Py_INCREF(result);
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	351 }
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	352 return result;
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	353 }
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	354
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	355 static PyGetSetDef type_getsets[] = {
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	356 {"__name__", (getter)type_name, (setter)type_set_name, NULL},
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	357 {"__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	358 {"__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	359 {"__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	360 {"__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	361 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	362 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	363
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	364 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	365 type_repr(PyTypeObject *type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	366 {
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	367 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	368 char *kind;
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	369
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	370 mod = type_module(type, NULL);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	371 if (mod == NULL)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	372 PyErr_Clear();
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	373 else if (!PyString_Check(mod)) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	374 Py_DECREF(mod);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	375 mod = NULL;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	376 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	377 name = type_name(type, NULL);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	378 if (name == NULL)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	379 return NULL;
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	380
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	381 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	382 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	383 else
d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	384 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	385
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	386 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	387 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	388 kind,
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	389 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	390 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	391 }
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	392 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	393 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	394
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	395 Py_XDECREF(mod);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	396 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	397 return rtn;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	398 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	399
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	400 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	401 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	402 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	403 PyObject *obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	404
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	405 if (type->tp_new == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	406 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	407 "cannot create '%.100s' instances",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	408 type->tp_name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	409 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	410 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	411
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	412 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	413 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	414 /* 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	415 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	416 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	417 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	418 (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	419 (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	420 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	421 /* 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	422 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	423 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	424 return obj;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	425 type = obj->ob_type;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	426 if (type->tp_init != NULL &&
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	427 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	428 Py_DECREF(obj);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	429 obj = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	430 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	431 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	432 return obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	433 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	434
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	435 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	436 PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	437 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	438 PyObject *obj;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	439 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	440 /* 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	441
b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	442 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	443 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	444 else
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	445 obj = (PyObject *)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	446
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	447 if (obj == NULL)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	448 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	449
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	450 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	451
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	452 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	453 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	454
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	455 if (type->tp_itemsize == 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	456 PyObject_INIT(obj, type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	457 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	458 (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	459
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	460 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	461 _PyObject_GC_TRACK(obj);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	462 return obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	463 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	464
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	465 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	466 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	467 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	468 return type->tp_alloc(type, 0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	469 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	470
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	471 /* 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	472
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	473 static int
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	474 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	475 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	476 Py_ssize_t i, n;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	477 PyMemberDef *mp;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	478
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	479 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	480 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	481 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	482 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	483 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	484 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	485 if (obj != NULL) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	486 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	487 if (err)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	488 return err;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	489 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	490 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	491 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	492 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	493 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	494
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	495 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	496 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	497 {
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	498 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	499 traverseproc basetraverse;
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 /* 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	502 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	503 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	504 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	505 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	506 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	507 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	508 if (err)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	509 return err;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	510 }
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	511 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	512 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	513 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	514
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	515 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	516 PyObject **dictptr = _PyObject_GetDictPtr(self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	517 if (dictptr && *dictptr)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	518 Py_VISIT(*dictptr);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	519 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	520
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	521 if (type->tp_flags & Py_TPFLAGS_HEAPTYPE)
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	522 /* 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	523 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	524 can find cycles involving this link. */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	525 Py_VISIT(type);
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	526
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	527 if (basetraverse)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	528 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	529 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	530 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	531
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	532 static void
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	533 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	534 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	535 Py_ssize_t i, n;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	536 PyMemberDef *mp;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	537
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	538 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	539 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	540 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	541 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	542 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	543 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	544 if (obj != NULL) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	545 (PyObject *)addr = NULL;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	546 Py_DECREF(obj);
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 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	549 }
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
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	552 static int
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	553 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	554 {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	555 PyTypeObject type, base;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	556 inquiry baseclear;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	557
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	558 /* 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	559 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	560 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	561 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	562 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	563 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	564 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	565 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	566 assert(base);
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
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	569 /* 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	570 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	571
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	572 if (baseclear)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	573 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	574 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	575 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	576
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	577 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	578 subtype_dealloc(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	579 {
21246 cb921d483e00 The previous checkin to clear __slots__ variables did a little bit of Guido van Rossum <guido@python.org> parents: 21242 diff changeset	580 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	581 destructor basedealloc;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	582
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	583 /* 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	584 type = self->ob_type;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	585 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	586
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	587 /* 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	588
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	589 if (!PyType_IS_GC(type)) {
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	590 /* 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	591 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	592 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	593 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	594 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	595
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	596 /* 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	597 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	598 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	599 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	600 return;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	601 }
24614 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 /* 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	604 base = type;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	605 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	606 assert(base->ob_size == 0);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	607 base = base->tp_base;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	608 assert(base);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	609 }
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	610
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	611 /* Call the base tp_dealloc() */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	612 assert(basedealloc);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	613 basedealloc(self);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	614
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	615 /* 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	616 Py_DECREF(type);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	617
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	618 /* Done */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	619 return;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	620 }
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	621
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	622 /* 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	623
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	624 /* UnTrack and re-Track around the trashcan macro, alas */
27717 41313d20d1dd Comment typo fix Andrew M. Kuchling <amk@amk.ca> parents: 27707 diff changeset	625 /* 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	626 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	627 ++_PyTrash_delete_nesting;
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	628 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	629 --_PyTrash_delete_nesting;
30915 8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	630 /* DO NOT restore GC tracking at this point. weakref callbacks
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	631 * (if any, and whether directly here or indirectly in something we
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	632 * call) may trigger GC, and if self is tracked at that point, it
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	633 * will look like trash to GC and GC will try to delete self again.
30907 3d9b36d6ab89 SF bug 840829: weakref callbacks and gc corrupt memory. Tim Peters <tim.peters@gmail.com> parents: 30722 diff changeset	634 */
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	635
29442 6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	636 /* 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	637 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	638 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	639 base = base->tp_base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	640 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	641 }
cb921d483e00 The previous checkin to clear __slots__ variables did a little bit of Guido van Rossum <guido@python.org> parents: 21242 diff changeset	642
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	643 /* 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	644 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	645 dict. */
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	646
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	647 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	648 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	649
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	650 /* 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	651 if (type->tp_del) {
30915 8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	652 _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	653 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	654 if (self->ob_refcnt > 0)
30915 8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	655 goto endlabel; /* resurrected */
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	656 else
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	657 _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	658 }
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	659
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 /* 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	661 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	662 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	663 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	664 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	665 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	666 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	667 }
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	668
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	669 /* 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	670 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	671 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	672 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	673 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	674 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	675 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	676 *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	677 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	678 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	679 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	680
30917 12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	681 /* Call the base tp_dealloc(); first retrack self if
12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	682 * basedealloc knows about gc.
12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	683 */
12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	684 if (PyType_IS_GC(base))
12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	685 _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	686 assert(basedealloc);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	687 basedealloc(self);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	688
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	689 /* 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	690 Py_DECREF(type);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	691
24653 1ab27c1770df Fix a subtle bug in the trashcan code I added yesterday to Guido van Rossum <guido@python.org> parents: 24614 diff changeset	692 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	693 ++_PyTrash_delete_nesting;
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	694 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	695 --_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	696
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	697 /* 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	698
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	699 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	700
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	701 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	702 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	703 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	704 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	705 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	706
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	707 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	708 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	709
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	710 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	711 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	712 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	713 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	714 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	715 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	716 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	717 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	718
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 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	720 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	721 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	722
30915 8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	723 Q. Why did the last question say "immediately GC-track again"?
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	724 It's nowhere near immediately.
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	725
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	726 A. Because the code used to re-track immediately. Bad Idea.
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	727 self has a refcount of 0, and if gc ever gets its hands on it
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	728 (which can happen if any weakref callback gets invoked), it
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	729 looks like trash to gc too, and gc also tries to delete self
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	730 then. But we're already deleting self. Double dealloction is
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	731 a subtle disaster.
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	732
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	733 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	734 _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	735
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 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	737 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	738
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	739 - 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	740
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	741 - 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	742
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	743 - 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	744 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	745 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	746
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	747 - 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	748 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	749
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 - 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	751 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	752
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 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	754 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	755
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 - 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	757
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 - 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	759
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 - 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	761
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 - 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	763 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	764
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 - 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	766
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 - 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	768 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	769 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	770
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 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	772 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	773 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	774 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	775 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	776 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	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 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	779 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	780 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	781 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	782 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	783 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	784 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	785
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 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	787 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	788
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 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	790 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	791 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	792 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	793 */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	794 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	795
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	796 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	797
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	798 /* type test with subclassing support */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	799
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	800 int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	801 PyType_IsSubtype(PyTypeObject a, PyTypeObject b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	802 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	803 PyObject *mro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	804
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	805 mro = a->tp_mro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	806 if (mro != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	807 /* Deal with multiple inheritance without recursion
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	808 by walking the MRO tuple */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	809 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	810 assert(PyTuple_Check(mro));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	811 n = PyTuple_GET_SIZE(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	812 for (i = 0; i < n; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	813 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	814 return 1;
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 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	817 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	818 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	819 /* 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	820 do {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	821 if (a == b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	822 return 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	823 a = a->tp_base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	824 } while (a != NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	825 return b == &PyBaseObject_Type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	826 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	827 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	828
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	829 /* 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	830 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	831 (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	832 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	833 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	834 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	835
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	836 Two variants:
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	837
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	838 - 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	839 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	840
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	841 - 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	842 */
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	843
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	844 static PyObject *
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	845 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	846 {
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	847 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	848
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 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	850 *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	851 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	852 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	853 }
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	854 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	855 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	856 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	857 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	858 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	859 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	860 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	861 }
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 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	863 }
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	864
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	865 static PyObject *
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	866 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	867 {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	868 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	869 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	870 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	871 return res;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	872 }
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	873
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	874 /* 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	875 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	876 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	877
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	878 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	879 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	880 {
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	881 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	882 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	883 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	884
20225 aa18c0ecc4fb call_method(), call_maybe(): fix a performance bug: the argument Guido van Rossum <guido@python.org> parents: 20220 diff changeset	885 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	886 if (func == NULL) {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	887 va_end(va);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	888 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	889 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	890 return NULL;
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
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	893 if (format && *format)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	894 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	895 else
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	896 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	897
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	898 va_end(va);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	899
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	900 if (args == NULL)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	901 return NULL;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	902
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	903 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	904 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	905
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	906 Py_DECREF(args);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	907 Py_DECREF(func);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	908
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	909 return retval;
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 /* 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	913
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	914 static PyObject *
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	915 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	916 {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	917 va_list va;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	918 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	919 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	920
20225 aa18c0ecc4fb call_method(), call_maybe(): fix a performance bug: the argument Guido van Rossum <guido@python.org> parents: 20220 diff changeset	921 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	922 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	923 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	924 if (!PyErr_Occurred()) {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	925 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	926 return Py_NotImplemented;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	927 }
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	928 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	929 }
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	930
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	931 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	932 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	933 else
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	934 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	935
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	936 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	937
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	938 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	939 return NULL;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	940
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	941 assert(PyTuple_Check(args));
cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	942 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	943
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	944 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	945 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	946
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	947 return retval;
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
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	950 /*
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	951 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	952 "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	953 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	954 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	955 (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	956
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	957 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	958
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	959 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	960 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	961
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	962 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	963
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	964 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	965 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	966 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	967
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	968 Monotonicity.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	969 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	970 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	971
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	972 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	973 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	974 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	975 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	976 */
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	977
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	978 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	979 tail_contains(PyObject list, int whence, PyObject o) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	980 Py_ssize_t j, size;
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	981 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	982
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	983 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	984 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	985 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	986 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	987 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	988 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	989
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	990 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	991 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	992 {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	993 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	994 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	995 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	996 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	997 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	998 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	999 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	1000 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	1001 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	1002 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	1003 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	1004 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1005 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	1006 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1007
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1008 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	1009 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	1010 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1011 Py_ssize_t i, j, n;
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1012 /* 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	1013 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	1014 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1015 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	1016 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	1017 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	1018 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	1019 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	1020 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	1021 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	1022 "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	1023 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	1024 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	1025 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	1026 }
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 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1029 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	1030 }
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 /* 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	1033
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1034 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	1035 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	1036 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	1037 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	1038 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	1039 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1040
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1041 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	1042 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	1043 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1044 Py_ssize_t i, n, off, to_merge_size;
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1045 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	1046 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	1047 PyObject *set = PyDict_New();
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1048 if (!set) return;
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1049
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1050 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	1051 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	1052 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	1053 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	1054 PyObject *c = PyList_GET_ITEM(L, remain[i]);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1055 if (PyDict_SetItem(set, c, Py_None) < 0) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1056 Py_DECREF(set);
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1057 return;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1058 }
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1059 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1060 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1061 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	1062
28514 9400504cb0b2 SF bug #699934: Obscure error message Raymond Hettinger <python@rcn.com> parents: 28403 diff changeset	1063 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	1064 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	1065 i = 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1066 while (PyDict_Next(set, &i, &k, &v) && (size_t)off < sizeof(buf)) {
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1067 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	1068 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	1069 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	1070 Py_XDECREF(name);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1071 if (--n && (size_t)(off+1) < sizeof(buf)) {
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1072 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	1073 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	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 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1076 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	1077 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	1078 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1079
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1080 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	1081 pmerge(PyObject acc, PyObject to_merge) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1082 Py_ssize_t i, j, to_merge_size, empty_cnt;
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1083 int *remain;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1084 int ok;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1085
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1086 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	1087
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1088 /* 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	1089 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	1090 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	1091 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1092 remain = (int )PyMem_MALLOC(SIZEOF_INTto_merge_size);
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1093 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	1094 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	1095 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	1096 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	1097
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1098 again:
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1099 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	1100 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	1101 PyObject *candidate;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1102
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1103 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	1104
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1105 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	1106 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	1107 continue;
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1108 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1109
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1110 /* 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	1111
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1112 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	1113 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	1114 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	1115 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1116
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1117 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	1118 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	1119 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	1120 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	1121 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	1122 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1123 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1124 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	1125 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	1126 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	1127 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	1128 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1129 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	1130 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	1131 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	1132 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	1133 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	1134 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1135 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1136 goto again;
26227 529719a5350e Repaired illegal syntax most compilers probably let slide (but MSVC Tim Peters <tim.peters@gmail.com> parents: 26222 diff changeset	1137 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	1138 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1139
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1140 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	1141 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	1142 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	1143 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1144 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	1145 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	1146 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	1147 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1148
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1149 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1150 mro_implementation(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1151 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1152 Py_ssize_t i, n;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1153 int ok;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1154 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	1155 PyObject to_merge, bases_aslist;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1156
23903 066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1157 if(type->tp_dict == NULL) {
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1158 if(PyType_Ready(type) < 0)
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1159 return NULL;
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1160 }
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1161
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1162 /* 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	1163 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	1164 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	1165
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1166 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	1167 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	1168 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	1169 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1170
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1171 bases = type->tp_bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1172 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	1173
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1174 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	1175 if (to_merge == NULL)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1176 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	1177
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1178 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	1179 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	1180 PyObject *parentMRO;
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1181 parentMRO = PySequence_List(((PyTypeObject*)base)->tp_mro);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1182 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	1183 Py_DECREF(to_merge);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1184 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	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
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1187 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	1188 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1189
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1190 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	1191 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	1192 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	1193 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1194 }
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1195 /* 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	1196 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	1197 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	1198 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	1199 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	1200 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1201 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	1202
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1203 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	1204 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	1205 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	1206 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	1207 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1208
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1209 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	1210 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	1211 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	1212 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	1213 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	1214 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1215
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1216 return result;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1217 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1218
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1219 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	1220 mro_external(PyObject *self)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1221 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1222 PyTypeObject type = (PyTypeObject )self;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1223
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1224 return mro_implementation(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1225 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1226
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1227 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1228 mro_internal(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1229 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1230 PyObject mro, result, *tuple;
36153 042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1231 int checkit = 0;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1232
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1233 if (type->ob_type == &PyType_Type) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1234 result = mro_implementation(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1235 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1236 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	1237 static PyObject *mro_str;
36153 042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1238 checkit = 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	1239 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	1240 if (mro == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1241 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1242 result = PyObject_CallObject(mro, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1243 Py_DECREF(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1244 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1245 if (result == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1246 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1247 tuple = PySequence_Tuple(result);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1248 Py_DECREF(result);
36153 042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1249 if (tuple == NULL)
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1250 return -1;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1251 if (checkit) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1252 Py_ssize_t i, len;
36153 042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1253 PyObject *cls;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1254 PyTypeObject *solid;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1255
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1256 solid = solid_base(type);
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1257
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1258 len = PyTuple_GET_SIZE(tuple);
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1259
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1260 for (i = 0; i < len; i++) {
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1261 PyTypeObject *t;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1262 cls = PyTuple_GET_ITEM(tuple, i);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1263 if (!PyType_Check(cls)) {
36153 042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1264 PyErr_Format(PyExc_TypeError,
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1265 "mro() returned a non-class ('%.500s')",
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1266 cls->ob_type->tp_name);
36169 652429c4f2a4 Fix ref/memory leak introduced in rev 41845. Neal Norwitz <nnorwitz@gmail.com> parents: 36153 diff changeset	1267 Py_DECREF(tuple);
36153 042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1268 return -1;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1269 }
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1270 t = (PyTypeObject*)cls;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1271 if (!PyType_IsSubtype(solid, solid_base(t))) {
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1272 PyErr_Format(PyExc_TypeError,
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1273 "mro() returned base with unsuitable layout ('%.500s')",
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1274 t->tp_name);
36169 652429c4f2a4 Fix ref/memory leak introduced in rev 41845. Neal Norwitz <nnorwitz@gmail.com> parents: 36153 diff changeset	1275 Py_DECREF(tuple);
36153 042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1276 return -1;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1277 }
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1278 }
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1279 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1280 type->tp_mro = tuple;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1281 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1282 }
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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1285 /* 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	1286 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	1287
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1288 static PyTypeObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1289 best_base(PyObject *bases)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1290 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1291 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1292 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	1293 PyObject *base_proto;
18933 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 assert(PyTuple_Check(bases));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1296 n = PyTuple_GET_SIZE(bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1297 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	1298 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	1299 winner = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1300 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	1301 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	1302 if (!PyType_Check(base_proto)) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1303 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1304 PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1305 "bases must be types");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1306 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1307 }
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1308 base_i = (PyTypeObject *)base_proto;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1309 if (base_i->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	1310 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	1311 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1312 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1313 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	1314 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	1315 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	1316 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	1317 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1318 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	1319 ;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1320 else if (PyType_IsSubtype(candidate, winner)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1321 winner = candidate;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1322 base = base_i;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1323 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1324 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1325 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1326 PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1327 "multiple bases have "
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1328 "instance lay-out conflict");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1329 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1330 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1331 }
21404 064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1332 if (base == NULL)
064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1333 PyErr_SetString(PyExc_TypeError,
064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1334 "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	1335 return base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1336 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1337
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1338 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1339 extra_ivars(PyTypeObject type, PyTypeObject base)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1340 {
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	1341 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	1342 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	1343
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1344 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	1345 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	1346 /* If itemsize is involved, stricter rules */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1347 return t_size != b_size \|\|
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1348 type->tp_itemsize != base->tp_itemsize;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1349 }
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1350 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	1351 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	1352 t_size -= sizeof(PyObject *);
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1353 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	1354 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	1355 t_size -= sizeof(PyObject *);
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1356
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1357 return t_size != b_size;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1358 }
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 static PyTypeObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1361 solid_base(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1362 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1363 PyTypeObject *base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1364
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1365 if (type->tp_base)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1366 base = solid_base(type->tp_base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1367 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1368 base = &PyBaseObject_Type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1369 if (extra_ivars(type, base))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1370 return type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1371 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1372 return base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1373 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1374
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1375 static void object_dealloc(PyObject *);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1376 static int object_init(PyObject , PyObject , PyObject *);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1377 static int update_slot(PyTypeObject , PyObject );
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1378 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	1379
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1380 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	1381 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	1382 {
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1383 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	1384 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	1385
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1386 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	1387 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	1388 "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	1389 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	1390 }
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1391 dict = *dictptr;
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1392 if (dict == NULL)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1393 *dictptr = dict = PyDict_New();
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1394 Py_XINCREF(dict);
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1395 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	1396 }
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1397
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1398 static int
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1399 subtype_setdict(PyObject obj, PyObject value, void *context)
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1400 {
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1401 PyObject **dictptr = _PyObject_GetDictPtr(obj);
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1402 PyObject *dict;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1403
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1404 if (dictptr == NULL) {
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1405 PyErr_SetString(PyExc_AttributeError,
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1406 "This object has no __dict__");
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1407 return -1;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1408 }
21235 b782490da7f0 At the PythonLabs meeting someone mentioned it would make Jim really Guido van Rossum <guido@python.org> parents: 21192 diff changeset	1409 if (value != NULL && !PyDict_Check(value)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1410 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1411 "__dict__ must be set to a dictionary, "
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1412 "not a '%.200s'", value->ob_type->tp_name);
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1413 return -1;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1414 }
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1415 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	1416 Py_XINCREF(value);
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1417 *dictptr = value;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1418 Py_XDECREF(dict);
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1419 return 0;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1420 }
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1421
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1422 static PyObject *
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1423 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	1424 {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1425 PyObject **weaklistptr;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1426 PyObject *result;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1427
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1428 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	1429 PyErr_SetString(PyExc_AttributeError,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1430 "This object has no __weakref__");
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1431 return NULL;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1432 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1433 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	1434 assert(obj->ob_type->tp_weaklistoffset + sizeof(PyObject *) <=
24762 ccf66a1aa0b8 Fix MSVC warnings. Guido van Rossum <guido@python.org> parents: 24761 diff changeset	1435 (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	1436 weaklistptr = (PyObject **)
24762 ccf66a1aa0b8 Fix MSVC warnings. Guido van Rossum <guido@python.org> parents: 24761 diff changeset	1437 ((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	1438 if (*weaklistptr == NULL)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1439 result = Py_None;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1440 else
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1441 result = *weaklistptr;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1442 Py_INCREF(result);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1443 return result;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1444 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1445
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	1446 /* 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	1447
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1448 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	1449 {"__dict__", subtype_dict, subtype_setdict,
24785 4de9ac0e4173 Allow docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24762 diff changeset	1450 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	1451 {"__weakref__", subtype_getweakref, NULL,
24785 4de9ac0e4173 Allow docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24762 diff changeset	1452 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	1453 {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	1454 };
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1455
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	1456 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	1457 {"__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	1458 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	1459 {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	1460 };
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1461
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1462 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	1463 {"__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	1464 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	1465 {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	1466 };
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1467
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1468 static int
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1469 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	1470 {
24245 50443127b21d valid_identifier(): use an unsigned char* so that isalpha() will do Guido van Rossum <guido@python.org> parents: 24184 diff changeset	1471 unsigned char *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1472 Py_ssize_t i, n;
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1473
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1474 if (!PyString_Check(s)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1475 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1476 "__slots__ items must be strings, not '%.200s'",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1477 s->ob_type->tp_name);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1478 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1479 }
24245 50443127b21d valid_identifier(): use an unsigned char* so that isalpha() will do Guido van Rossum <guido@python.org> parents: 24184 diff changeset	1480 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	1481 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	1482 /* 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	1483 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	1484 if (n == 0)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1485 n = 1;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1486 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	1487 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	1488 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	1489 "__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	1490 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1491 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1492 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1493 return 1;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1494 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1495
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1496 #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	1497 /* 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	1498
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1499 static PyObject *
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	1500 _unicode_to_string(PyObject *slots, Py_ssize_t nslots)
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1501 {
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1502 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	1503 PyObject o, o1;
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	1504 Py_ssize_t i;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1505 ssizessizeargfunc copy = slots->ob_type->tp_as_sequence->sq_slice;
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1506 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	1507 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	1508 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	1509 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	1510 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	1511 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	1512 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1513 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	1514 (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	1515 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	1516 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	1517 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	1518 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1519 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	1520 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	1521 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	1522 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1523 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1524 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	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 #endif
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1527
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	1528 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1529 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	1530 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1531 PyObject name, bases, *dict;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36631 diff changeset	1532 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	1533 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	1534 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	1535 PyHeapTypeObject *et;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	1536 PyMemberDef *mp;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1537 Py_ssize_t 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	1538 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	1539
20725 7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1540 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	1541 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	1542
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	1543 /* 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	1544 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1545 const Py_ssize_t nargs = PyTuple_GET_SIZE(args);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1546 const Py_ssize_t nkwds = kwds == NULL ? 0 : PyDict_Size(kwds);
20725 7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1547
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1548 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	1549 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	1550 Py_INCREF(x->ob_type);
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1551 return (PyObject *) x->ob_type;
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1552 }
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1553
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1554 /* 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	1555 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	1556 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	1557 if (nargs + nkwds != 3) {
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1558 PyErr_SetString(PyExc_TypeError,
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1559 "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	1560 return NULL;
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1561 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1562 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1563
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	1564 /* Check arguments: (name, bases, dict) */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1565 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	1566 &name,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1567 &PyTuple_Type, &bases,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1568 &PyDict_Type, &dict))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1569 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1570
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1571 /* 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	1572 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	1573 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	1574 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	1575 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	1576 winner = metatype;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1577 for (i = 0; i < nbases; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1578 tmp = PyTuple_GET_ITEM(bases, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1579 tmptype = tmp->ob_type;
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	1580 if (PyType_IsSubtype(winner, tmptype))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1581 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	1582 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	1583 winner = tmptype;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1584 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1585 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1586 PyErr_SetString(PyExc_TypeError,
28737 d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1587 "metaclass conflict: "
d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1588 "the metaclass of a derived class "
d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1589 "must be a (non-strict) subclass "
d792544ab111 Improve the message about metatype/metaclass conflicts. Guido van Rossum <guido@python.org> parents: 28640 diff changeset	1590 "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	1591 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1592 }
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	1593 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	1594 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	1595 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	1596 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	1597 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1598
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1599 /* Adjust for empty tuple bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1600 if (nbases == 0) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	1601 bases = PyTuple_Pack(1, &PyBaseObject_Type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1602 if (bases == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1603 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1604 nbases = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1605 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1606 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1607 Py_INCREF(bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1608
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1609 /* 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	1610
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1611 /* 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	1612 base = best_base(bases);
30098 d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1613 if (base == NULL) {
d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1614 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1615 return NULL;
30098 d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1616 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1617 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	1618 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1619 "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	1620 base->tp_name);
30098 d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1621 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1622 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1623 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1624
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1625 /* 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	1626 slots = PyDict_GetItemString(dict, "__slots__");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1627 nslots = 0;
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1628 add_dict = 0;
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1629 add_weak = 0;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1630 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	1631 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	1632 if (slots == NULL) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1633 if (may_add_dict) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1634 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1635 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1636 if (may_add_weak) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1637 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1638 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1639 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1640 else {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1641 /* Have slots */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1642
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1643 /* Make it into a tuple */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1644 if (PyString_Check(slots))
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	1645 slots = PyTuple_Pack(1, slots);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1646 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1647 slots = PySequence_Tuple(slots);
30098 d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1648 if (slots == NULL) {
d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1649 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1650 return NULL;
30098 d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1651 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1652 assert(PyTuple_Check(slots));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1653
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1654 /* Are slots allowed? */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1655 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	1656 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	1657 PyErr_Format(PyExc_TypeError,
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1658 "nonempty __slots__ "
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1659 "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	1660 base->tp_name);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1661 bad_slots:
30098 d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1662 Py_DECREF(bases);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1663 Py_DECREF(slots);
19595 db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1664 return NULL;
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	1665 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1666
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1667 #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	1668 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	1669 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	1670 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	1671 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	1672 }
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1673 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	1674 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	1675 #endif
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1676 /* 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	1677 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	1678 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	1679 char *s;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1680 if (!valid_identifier(tmp))
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1681 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1682 assert(PyString_Check(tmp));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1683 s = PyString_AS_STRING(tmp);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1684 if (strcmp(s, "__dict__") == 0) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1685 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	1686 PyErr_SetString(PyExc_TypeError,
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1687 "__dict__ slot disallowed: "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1688 "we already got one");
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1689 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1690 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1691 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1692 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1693 if (strcmp(s, "__weakref__") == 0) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1694 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	1695 PyErr_SetString(PyExc_TypeError,
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1696 "__weakref__ slot disallowed: "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1697 "either we already got one, "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1698 "or __itemsize__ != 0");
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1699 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1700 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1701 add_weak++;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1702 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1703 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1704
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1705 /* 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	1706 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	1707 if (newslots == NULL)
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1708 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1709 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	1710 char *s;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1711 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	1712 s = PyString_AS_STRING(tmp);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1713 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	1714 (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	1715 continue;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35637 diff changeset	1716 tmp =_Py_Mangle(name, tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35637 diff changeset	1717 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35637 diff changeset	1718 goto bad_slots;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1719 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	1720 j++;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1721 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1722 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	1723 nslots = j;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1724 Py_DECREF(slots);
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1725 slots = newslots;
f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	1726
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1727 /* 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	1728 if (nbases > 1 &&
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1729 ((may_add_dict && !add_dict) \|\|
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1730 (may_add_weak && !add_weak))) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1731 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	1732 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	1733 if (tmp == (PyObject *)base)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1734 continue; /* Skip primary base */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1735 assert(PyType_Check(tmp));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1736 tmptype = (PyTypeObject *)tmp;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1737 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	1738 tmptype->tp_dictoffset != 0)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1739 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1740 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	1741 tmptype->tp_weaklistoffset != 0)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1742 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1743 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	1744 continue;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1745 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	1746 continue;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1747 /* Nothing more to check */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1748 break;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1749 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1750 }
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1751 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1752
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1753 /* 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	1754 "return NULL" may leak slots! */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1755
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1756 /* Allocate the type object */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1757 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	1758 if (type == NULL) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1759 Py_XDECREF(slots);
30098 d6379620fb08 /* XXX From here until type is allocated, "return NULL" leaks bases! / Michael W. Hudson <mwh@python.net>* parents: 30084 diff changeset	1760 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1761 return NULL;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1762 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1763
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1764 /* 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	1765 et = (PyHeapTypeObject *)type;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1766 Py_INCREF(name);
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	1767 et->ht_name = name;
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	1768 et->ht_slots = slots;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1769
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1770 /* Initialize tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1771 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	1772 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	1773 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	1774 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	1775
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	1776 /* Initialize essential fields */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1777 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	1778 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	1779 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	1780 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	1781 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	1782
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1783 /* Set tp_base and tp_bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1784 type->tp_bases = bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1785 Py_INCREF(base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1786 type->tp_base = base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1787
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	1788 /* 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	1789 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	1790 if (dict == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1791 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1792 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1793 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1794
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1795 /* Set __module__ in the dict */
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1796 if (PyDict_GetItemString(dict, "__module__") == NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1797 tmp = PyEval_GetGlobals();
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1798 if (tmp != NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1799 tmp = PyDict_GetItemString(tmp, "__name__");
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1800 if (tmp != NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1801 if (PyDict_SetItemString(dict, "__module__",
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1802 tmp) < 0)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1803 return NULL;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1804 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1805 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1806 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	1807
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1808 /* 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	1809 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	1810 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	1811 */
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1812 {
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1813 PyObject *doc = PyDict_GetItemString(dict, "__doc__");
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1814 if (doc != NULL && PyString_Check(doc)) {
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1815 const size_t n = (size_t)PyString_GET_SIZE(doc);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1816 char tp_doc = (char )PyObject_MALLOC(n+1);
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	1817 if (tp_doc == NULL) {
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1818 Py_DECREF(type);
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1819 return NULL;
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1820 }
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	1821 memcpy(tp_doc, PyString_AS_STRING(doc), n+1);
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	1822 type->tp_doc = tp_doc;
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1823 }
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1824 }
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	1825
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1826 /* 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	1827 make it a static function */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1828 tmp = PyDict_GetItemString(dict, "__new__");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1829 if (tmp != NULL && PyFunction_Check(tmp)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1830 tmp = PyStaticMethod_New(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1831 if (tmp == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1832 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1833 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1834 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1835 PyDict_SetItemString(dict, "__new__", tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1836 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1837 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1838
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1839 /* 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	1840 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	1841 slotoffset = base->tp_basicsize;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1842 if (slots != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1843 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	1844 mp->name = PyString_AS_STRING(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1845 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	1846 mp->type = T_OBJECT_EX;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1847 mp->offset = slotoffset;
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1848 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	1849 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	1850 add_weak++;
21192 c18ad52dece3 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 21151 diff changeset	1851 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	1852 mp->flags = READONLY;
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1853 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	1854 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1855 slotoffset += sizeof(PyObject *);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1856 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1857 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1858 if (add_dict) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1859 if (base->tp_itemsize)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1860 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	1861 else
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1862 type->tp_dictoffset = slotoffset;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1863 slotoffset += sizeof(PyObject *);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1864 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1865 if (add_weak) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1866 assert(!base->tp_itemsize);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1867 type->tp_weaklistoffset = slotoffset;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1868 slotoffset += sizeof(PyObject *);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1869 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1870 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	1871 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	1872 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	1873
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1874 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	1875 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	1876 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	1877 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	1878 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	1879 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	1880 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	1881 type->tp_getset = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1882
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1883 /* Special case some slots */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1884 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	1885 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	1886 type->tp_getattro = PyObject_GenericGetAttr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1887 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	1888 type->tp_setattro = PyObject_GenericSetAttr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1889 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1890 type->tp_dealloc = subtype_dealloc;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1891
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	1892 /* 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	1893 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	1894 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	1895 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	1896
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1897 /* 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	1898 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	1899 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	1900 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	1901 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	1902 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	1903 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	1904 else
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	1905 type->tp_free = PyObject_Del;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1906
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1907 /* Initialize the rest */
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	1908 if (PyType_Ready(type) < 0) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1909 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1910 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1911 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1912
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	1913 /* 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	1914 fixup_slot_dispatchers(type);
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	1915
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1916 return (PyObject *)type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1917 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1918
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1919 /* 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	1920 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	1921 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1922 _PyType_Lookup(PyTypeObject type, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1923 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1924 Py_ssize_t 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	1925 PyObject mro, res, base, dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1926
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	1927 /* 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	1928 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	1929
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	1930 /* 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	1931 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	1932 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	1933 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	1934 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	1935
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1936 assert(PyTuple_Check(mro));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1937 n = PyTuple_GET_SIZE(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1938 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	1939 base = PyTuple_GET_ITEM(mro, i);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1940 assert(PyType_Check(base));
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1941 dict = ((PyTypeObject *)base)->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1942 assert(dict && PyDict_Check(dict));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1943 res = PyDict_GetItem(dict, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1944 if (res != NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1945 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1946 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1947 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1948 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1949
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1950 /* This is similar to PyObject_GenericGetAttr(),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1951 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	1952 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1953 type_getattro(PyTypeObject type, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1954 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1955 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	1956 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	1957 descrgetfunc meta_get;
18933 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 /* 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	1960 if (type->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	1961 if (PyType_Ready(type) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1962 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1963 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1964
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1965 /* 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	1966 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	1967
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1968 /* 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	1969 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	1970
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1971 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	1972 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	1973
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1974 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	1975 /* 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	1976 * 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	1977 * 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	1978 */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1979 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	1980 (PyObject *)metatype);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1981 }
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	1982 Py_INCREF(meta_attribute);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1983 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1984
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1985 /* 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	1986 * 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	1987 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	1988 if (attribute != NULL) {
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1989 /* 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	1990 descrgetfunc local_get = attribute->ob_type->tp_descr_get;
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	1991
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	1992 Py_XDECREF(meta_attribute);
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	1993
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1994 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	1995 /* 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	1996 * 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	1997 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	1998 (PyObject *)type);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	1999 }
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23967 diff changeset	2000
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2001 Py_INCREF(attribute);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2002 return attribute;
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
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2005 /* 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	2006 * descriptor from the metatype, if any */
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2007 if (meta_get != NULL) {
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2008 PyObject *res;
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2009 res = meta_get(meta_attribute, (PyObject *)type,
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2010 (PyObject *)metatype);
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2011 Py_DECREF(meta_attribute);
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2012 return res;
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2013 }
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2014
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2015 /* 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	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 return meta_attribute;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2018 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2019
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2020 /* Give up */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2021 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	2022 "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	2023 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	2024 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2025 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2026
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2027 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2028 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	2029 {
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2030 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	2031 PyErr_Format(
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2032 PyExc_TypeError,
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2033 "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	2034 type->tp_name);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2035 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	2036 }
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	2037 /* 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	2038 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	2039 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	2040 */
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2041 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	2042 return -1;
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2043 return update_slot(type, name);
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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2046 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2047 type_dealloc(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2048 {
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2049 PyHeapTypeObject *et;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2050
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2051 /* 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	2052 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	2053 _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	2054 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	2055 et = (PyHeapTypeObject *)type;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2056 Py_XDECREF(type->tp_base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2057 Py_XDECREF(type->tp_dict);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2058 Py_XDECREF(type->tp_bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2059 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	2060 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	2061 Py_XDECREF(type->tp_subclasses);
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	2062 /* A type's tp_doc is heap allocated, unlike the tp_doc slots
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	2063 * of most other objects. It's okay to cast it to char *.
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	2064 */
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	2065 PyObject_Free((char *)type->tp_doc);
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	2066 Py_XDECREF(et->ht_name);
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	2067 Py_XDECREF(et->ht_slots);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2068 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	2069 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2070
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2071 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	2072 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	2073 {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2074 PyObject list, raw, *ref;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	2075 Py_ssize_t i, n;
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2076
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2077 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	2078 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	2079 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	2080 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	2081 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	2082 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	2083 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	2084 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	2085 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	2086 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	2087 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	2088 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	2089 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	2090 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	2091 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	2092 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	2093 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2094 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2095 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2096 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	2097 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2098
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2099 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	2100 {"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	2101 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	2102 {"__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	2103 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	2104 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2105 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2106
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	2107 PyDoc_STRVAR(type_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2108 "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	2109 "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	2110
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2111 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	2112 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	2113 {
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2114 /* 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	2115 for heaptypes. */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2116 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	2117
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2118 Py_VISIT(type->tp_dict);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2119 Py_VISIT(type->tp_cache);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2120 Py_VISIT(type->tp_mro);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2121 Py_VISIT(type->tp_bases);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2122 Py_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	2123
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2124 /* There's no need to visit type->tp_subclasses or
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	2125 ((PyHeapTypeObject *)type)->ht_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	2126 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	2127 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	2128
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2129 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	2130 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2131
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2132 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	2133 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	2134 {
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2135 /* 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	2136 for heaptypes. */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2137 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	2138
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2139 /* 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	2140 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	2141 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	2142 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	2143 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	2144
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2145 tp_dict:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2146 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	2147
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2148 tp_cache:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2149 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	2150
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2151 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	2152 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	2153 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	2154 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	2155
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2156 tp_subclasses:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2157 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	2158 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	2159
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2160 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	2161 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	2162 */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2163
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2164 Py_CLEAR(type->tp_mro);
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2165
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2166 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	2167 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2168
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2169 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	2170 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	2171 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2172 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	2173 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2174
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2175 PyTypeObject PyType_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2176 PyObject_HEAD_INIT(&PyType_Type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2177 0, /* ob_size */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2178 "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	2179 sizeof(PyHeapTypeObject), /* tp_basicsize */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	2180 sizeof(PyMemberDef), /* tp_itemsize */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2181 (destructor)type_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2182 0, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2183 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2184 0, /* tp_setattr */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2185 0, /* tp_compare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2186 (reprfunc)type_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2187 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2188 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2189 0, /* tp_as_mapping */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2190 0, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2191 (ternaryfunc)type_call, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2192 0, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2193 (getattrofunc)type_getattro, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2194 (setattrofunc)type_setattro, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2195 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	2196 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	2197 Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2198 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	2199 (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	2200 (inquiry)type_clear, /* tp_clear */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2201 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	2202 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	2203 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2204 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2205 type_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2206 type_members, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2207 type_getsets, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2208 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2209 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2210 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2211 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2212 offsetof(PyTypeObject, tp_dict), /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2213 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2214 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2215 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	2216 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	2217 (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	2218 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2219
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2220
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2221 /* 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	2222
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2223 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2224 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	2225 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2226 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2227 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2228
27866 bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2229 /* 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	2230 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	2231 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	2232 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	2233 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	2234 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	2235 static PyObject *
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2236 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	2237 {
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2238 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	2239 (kwds && PyDict_Check(kwds) && PyDict_Size(kwds)))) {
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2240 PyErr_SetString(PyExc_TypeError,
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2241 "default __new__ takes no parameters");
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2242 return NULL;
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2243 }
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2244 return type->tp_alloc(type, 0);
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2245 }
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2246
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2247 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2248 object_dealloc(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2249 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2250 self->ob_type->tp_free(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2251 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2252
19194 7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2253 static PyObject *
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2254 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	2255 {
19316 f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2256 PyTypeObject *type;
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2257 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	2258
19316 f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2259 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	2260 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	2261 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	2262 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	2263 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	2264 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	2265 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	2266 }
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2267 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	2268 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	2269 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	2270 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	2271 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	2272 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	2273 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	2274 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	2275 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	2276 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	2277 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	2278 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	2279 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	2280 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	2281 }
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2282
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2283 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2284 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	2285 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2286 unaryfunc f;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2287
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2288 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	2289 if (f == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2290 f = object_repr;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2291 return f(self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2292 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2293
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2294 static PyObject *
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2295 object_richcompare(PyObject self, PyObject other, int op)
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2296 {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2297 PyObject *res;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2298
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2299 switch (op) {
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2300
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2301 case Py_EQ:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2302 res = (self == other) ? Py_True : Py_False;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2303 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2304
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2305 case Py_NE:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2306 res = (self != other) ? Py_True : Py_False;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2307 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2308
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2309 default:
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2310 res = Py_NotImplemented;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2311 break;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2312 }
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2313
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2314 Py_INCREF(res);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2315 return res;
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2316 }
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2317
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2318 static PyObject *
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2319 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	2320 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2321 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	2322 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	2323 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2324
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2325 static int
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2326 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	2327 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2328 return a == b \|\|
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2329 (a != NULL &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2330 b != NULL &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2331 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	2332 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	2333 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	2334 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	2335 ((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	2336 (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	2337 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2338
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2339 static int
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2340 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	2341 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2342 PyTypeObject *base = a->tp_base;
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	2343 Py_ssize_t size;
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2344
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2345 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	2346 return 0;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2347 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	2348 return 1;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2349 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	2350 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	2351 size += sizeof(PyObject *);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2352 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	2353 size += sizeof(PyObject *);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2354 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	2355 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2356
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2357 static int
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2358 compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, char* attr)
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2359 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2360 PyTypeObject newbase, oldbase;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2361
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2362 if (newto->tp_dealloc != oldto->tp_dealloc \|\|
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2363 newto->tp_free != oldto->tp_free)
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2364 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2365 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2366 "%s assignment: "
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2367 "'%s' deallocator differs from '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2368 attr,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2369 newto->tp_name,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2370 oldto->tp_name);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2371 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2372 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2373 newbase = newto;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2374 oldbase = oldto;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2375 while (equiv_structs(newbase, newbase->tp_base))
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2376 newbase = newbase->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2377 while (equiv_structs(oldbase, oldbase->tp_base))
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2378 oldbase = oldbase->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2379 if (newbase != oldbase &&
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2380 (newbase->tp_base != oldbase->tp_base \|\|
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2381 !same_slots_added(newbase, oldbase))) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2382 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2383 "%s assignment: "
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2384 "'%s' object layout differs from '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2385 attr,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2386 newto->tp_name,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2387 oldto->tp_name);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2388 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2389 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	2390
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2391 return 1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2392 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2393
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2394 static int
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2395 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	2396 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2397 PyTypeObject *oldto = self->ob_type;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2398 PyTypeObject *newto;
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2399
23037 89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2400 if (value == NULL) {
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2401 PyErr_SetString(PyExc_TypeError,
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2402 "can't delete __class__ attribute");
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2403 return -1;
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2404 }
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2405 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	2406 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	2407 "__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	2408 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	2409 return -1;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2410 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2411 newto = (PyTypeObject *)value;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2412 if (!(newto->tp_flags & Py_TPFLAGS_HEAPTYPE) \|\|
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2413 !(oldto->tp_flags & Py_TPFLAGS_HEAPTYPE))
24728 3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2414 {
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2415 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	2416 "__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	2417 return -1;
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2418 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2419 if (compatible_for_assignment(newto, oldto, "__class__")) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2420 Py_INCREF(newto);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2421 self->ob_type = newto;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2422 Py_DECREF(oldto);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2423 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2424 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2425 else {
23541 f6ded6efabcf Add a safeguard against setting the class to something with a Guido van Rossum <guido@python.org> parents: 23127 diff changeset	2426 return -1;
f6ded6efabcf Add a safeguard against setting the class to something with a Guido van Rossum <guido@python.org> parents: 23127 diff changeset	2427 }
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2428 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2429
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2430 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	2431 {"__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	2432 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	2433 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2434 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2435
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2436
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2437 /* 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	2438 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	2439 - pickle protocols < 2
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2440 - 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	2441 - 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	2442 */
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2443
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2444 static PyObject *
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2445 import_copy_reg(void)
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2446 {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2447 static PyObject *copy_reg_str;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2448
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2449 if (!copy_reg_str) {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2450 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	2451 if (copy_reg_str == NULL)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2452 return NULL;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2453 }
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2454
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2455 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	2456 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2457
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2458 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2459 slotnames(PyObject *cls)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2460 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2461 PyObject *clsdict;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2462 PyObject *copy_reg;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2463 PyObject *slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2464
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2465 if (!PyType_Check(cls)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2466 Py_INCREF(Py_None);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2467 return Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2468 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2469
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2470 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	2471 slotnames = PyDict_GetItemString(clsdict, "__slotnames__");
35637 7dd4e6cb9d27 (pedronis, arigo) Armin Rigo <arigo@tunes.org> parents: 35610 diff changeset	2472 if (slotnames != NULL && PyList_Check(slotnames)) {
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2473 Py_INCREF(slotnames);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2474 return slotnames;
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
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2477 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	2478 if (copy_reg == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2479 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2480
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2481 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	2482 Py_DECREF(copy_reg);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2483 if (slotnames != NULL &&
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2484 slotnames != Py_None &&
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2485 !PyList_Check(slotnames))
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2486 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2487 PyErr_SetString(PyExc_TypeError,
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2488 "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	2489 Py_DECREF(slotnames);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2490 slotnames = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2491 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2492
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2493 return slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2494 }
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 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2497 reduce_2(PyObject *obj)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2498 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2499 PyObject cls, getnewargs;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2500 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	2501 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	2502 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	2503 PyObject copy_reg = NULL, newobj = NULL, *res = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	2504 Py_ssize_t i, n;
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2505
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2506 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	2507 if (cls == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2508 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2509
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2510 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	2511 if (getnewargs != NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2512 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	2513 Py_DECREF(getnewargs);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2514 if (args != NULL && !PyTuple_Check(args)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2515 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2516 "__getnewargs__ should return a tuple, "
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2517 "not '%.200s'", args->ob_type->tp_name);
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2518 goto end;
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 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2521 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2522 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2523 args = PyTuple_New(0);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2524 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2525 if (args == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2526 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2527
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2528 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	2529 if (getstate != NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2530 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	2531 Py_DECREF(getstate);
29382 585e303a9491 Fix SF #749831, copy raises SystemError when getstate raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 29308 diff changeset	2532 if (state == NULL)
585e303a9491 Fix SF #749831, copy raises SystemError when getstate raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 29308 diff changeset	2533 goto end;
28016 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 else {
31477 ba9aaddeb956 Fixed a bug in object.__reduce_ex__ (reduce_2) when using protocol Jim Fulton <jim@zope.com> parents: 31176 diff changeset	2536 PyErr_Clear();
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2537 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	2538 if (state == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2539 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2540 state = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2541 Py_INCREF(state);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2542 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2543 names = slotnames(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2544 if (names == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2545 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2546 if (names != Py_None) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2547 assert(PyList_Check(names));
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2548 slots = PyDict_New();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2549 if (slots == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2550 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2551 n = 0;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2552 /* 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	2553 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	2554 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	2555 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	2556 PyObject name, value;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2557 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	2558 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	2559 if (value == NULL)
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 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2562 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	2563 value);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2564 Py_DECREF(value);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2565 if (err)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2566 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2567 n++;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2568 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2569 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2570 if (n) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2571 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	2572 if (state == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2573 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2574 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2575 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2576 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2577
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2578 if (!PyList_Check(obj)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2579 listitems = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2580 Py_INCREF(listitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2581 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2582 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2583 listitems = PyObject_GetIter(obj);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2584 if (listitems == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2585 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2586 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2587
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2588 if (!PyDict_Check(obj)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2589 dictitems = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2590 Py_INCREF(dictitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2591 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2592 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2593 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	2594 if (dictitems == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2595 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2596 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2597
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2598 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	2599 if (copy_reg == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2600 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2601 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	2602 if (newobj == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2603 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2604
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2605 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	2606 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	2607 if (args2 == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2608 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2609 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	2610 cls = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2611 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	2612 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	2613 Py_INCREF(v);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2614 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	2615 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2616
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	2617 res = PyTuple_Pack(5, newobj, args2, state, listitems, dictitems);
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2618
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2619 end:
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2620 Py_XDECREF(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2621 Py_XDECREF(args);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2622 Py_XDECREF(args2);
28566 9ddc498b7013 Missing DECREF. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28514 diff changeset	2623 Py_XDECREF(slots);
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2624 Py_XDECREF(state);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2625 Py_XDECREF(names);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2626 Py_XDECREF(listitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2627 Py_XDECREF(dictitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2628 Py_XDECREF(copy_reg);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2629 Py_XDECREF(newobj);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2630 return res;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2631 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2632
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2633 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2634 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	2635 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2636 /* 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	2637 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	2638 int proto = 0;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2639
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2640 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	2641 return NULL;
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 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	2644 if (reduce == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2645 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2646 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2647 PyObject cls, clsreduce, *objreduce;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2648 int override;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2649 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	2650 if (cls == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2651 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2652 return NULL;
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 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	2655 Py_DECREF(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2656 if (clsreduce == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2657 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2658 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2659 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2660 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	2661 "__reduce__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2662 override = (clsreduce != objreduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2663 Py_DECREF(clsreduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2664 if (override) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2665 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	2666 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2667 return res;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2668 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2669 else
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2670 Py_DECREF(reduce);
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
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2673 if (proto >= 2)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2674 return reduce_2(self);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2675
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2676 copy_reg = import_copy_reg();
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2677 if (!copy_reg)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2678 return NULL;
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2679
27948 db1d4584a5e1 Introducing __reduce_ex__, which is called with a protocol number argument Guido van Rossum <guido@python.org> parents: 27943 diff changeset	2680 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	2681 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	2682
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2683 return res;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2684 }
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2685
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2686 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	2687 {"__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	2688 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	2689 {"__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	2690 PyDoc_STR("helper for pickle")},
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2691 {0}
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2692 };
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2693
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2694
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2695 PyTypeObject PyBaseObject_Type = {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2696 PyObject_HEAD_INIT(&PyType_Type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2697 0, /* ob_size */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2698 "object", /* tp_name */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2699 sizeof(PyObject), /* tp_basicsize */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2700 0, /* tp_itemsize */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2701 object_dealloc, /* tp_dealloc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2702 0, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2703 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2704 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2705 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	2706 object_repr, /* tp_repr */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2707 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2708 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2709 0, /* tp_as_mapping */
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	2710 (hashfunc)_Py_HashPointer, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2711 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	2712 object_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2713 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	2714 PyObject_GenericSetAttr, /* tp_setattro */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2715 0, /* tp_as_buffer */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2716 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	2717 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	2718 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2719 0, /* tp_clear */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39624 diff changeset	2720 object_richcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2721 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2722 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2723 0, /* tp_iternext */
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2724 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	2725 0, /* tp_members */
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2726 object_getsets, /* tp_getset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2727 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2728 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2729 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2730 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2731 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2732 object_init, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2733 PyType_GenericAlloc, /* tp_alloc */
27866 bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2734 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	2735 PyObject_Del, /* tp_free */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2736 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2737
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2738
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	2739 /* Add the methods from tp_methods to the __dict__ in a type object */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2740
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2741 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2742 add_methods(PyTypeObject type, PyMethodDef meth)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2743 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2744 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2745
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2746 for (; meth->ml_name != NULL; meth++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2747 PyObject *descr;
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 30917 diff changeset	2748 if (PyDict_GetItemString(dict, meth->ml_name) &&
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 30917 diff changeset	2749 !(meth->ml_flags & METH_COEXIST))
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 30917 diff changeset	2750 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	2751 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	2752 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	2753 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	2754 "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	2755 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	2756 }
26583 8991f78817c7 SF 548651: Fix the METH_CLASS implementation. Tim Peters <tim.peters@gmail.com> parents: 26575 diff changeset	2757 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	2758 }
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2759 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	2760 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	2761 if (cfunc == NULL)
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2762 return -1;
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2763 descr = PyStaticMethod_New(cfunc);
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	2764 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	2765 }
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2766 else {
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	2767 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	2768 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2769 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2770 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	2771 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	2772 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2773 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2774 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2775 return 0;
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 static int
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	2779 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	2780 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2781 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2782
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2783 for (; memb->name != NULL; memb++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2784 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2785 if (PyDict_GetItemString(dict, memb->name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2786 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2787 descr = PyDescr_NewMember(type, memb);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2788 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2789 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2790 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	2791 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2792 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2793 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2794 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2795 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2796
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2797 static int
20015 ca7af2a5d915 Add optional docstrings to getset descriptors. Fortunately, there's Guido van Rossum <guido@python.org> parents: 20012 diff changeset	2798 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	2799 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2800 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2801
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2802 for (; gsp->name != NULL; gsp++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2803 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2804 if (PyDict_GetItemString(dict, gsp->name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2805 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2806 descr = PyDescr_NewGetSet(type, gsp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2807
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2808 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2809 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2810 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	2811 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2812 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2813 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2814 return 0;
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
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2817 static void
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2818 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	2819 {
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	2820 Py_ssize_t oldsize, newsize;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2821
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2822 /* 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	2823 oldsize = base->tp_basicsize;
13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2824 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	2825 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	2826 (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	2827 (!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	2828 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	2829 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	2830 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	2831 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	2832 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	2833 }
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	2834 {
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	2835 /* 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	2836 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	2837 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	2838 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	2839 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	2840 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	2841 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	2842 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	2843 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	2844 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	2845 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	2846 (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	2847 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	2848 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	2849 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2850 }
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	2851 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	2852
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2853 /* 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	2854
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2855 #undef COPYVAL
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2856 #define COPYVAL(SLOT) \
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2857 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	2858
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	2859 COPYVAL(tp_itemsize);
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	2860 COPYVAL(tp_weaklistoffset);
b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	2861 COPYVAL(tp_dictoffset);
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2862 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2863
39623 c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2864 /* Map rich comparison operators to their __xx__ namesakes */
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2865 static char *name_op[] = {
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2866 "__lt__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2867 "__le__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2868 "__eq__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2869 "__ne__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2870 "__gt__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2871 "__ge__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2872 /* These are only for overrides_cmp_or_hash(): */
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2873 "__cmp__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2874 "__hash__",
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2875 };
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2876
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2877 static int
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2878 overrides_cmp_or_hash(PyTypeObject *type)
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2879 {
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2880 int i;
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2881 PyObject *dict = type->tp_dict;
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2882
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2883 assert(dict != NULL);
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2884 for (i = 0; i < 8; i++) {
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2885 if (PyDict_GetItemString(dict, name_op[i]) != NULL)
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2886 return 1;
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2887 }
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2888 return 0;
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2889 }
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	2890
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2891 static void
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2892 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	2893 {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2894 PyTypeObject *basebase;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2895
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2896 #undef SLOTDEFINED
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2897 #undef COPYSLOT
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2898 #undef COPYNUM
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2899 #undef COPYSEQ
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2900 #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	2901 #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	2902
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2903 #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	2904 (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	2905 (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	2906
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2907 #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	2908 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	2909
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2910 #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	2911 #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	2912 #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	2913 #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	2914
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2915 /* 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	2916 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	2917
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2918 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	2919 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	2920 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	2921 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2922 COPYNUM(nb_add);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2923 COPYNUM(nb_subtract);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2924 COPYNUM(nb_multiply);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2925 COPYNUM(nb_remainder);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2926 COPYNUM(nb_divmod);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2927 COPYNUM(nb_power);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2928 COPYNUM(nb_negative);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2929 COPYNUM(nb_positive);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2930 COPYNUM(nb_absolute);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2931 COPYNUM(nb_nonzero);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2932 COPYNUM(nb_invert);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2933 COPYNUM(nb_lshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2934 COPYNUM(nb_rshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2935 COPYNUM(nb_and);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2936 COPYNUM(nb_xor);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2937 COPYNUM(nb_or);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2938 COPYNUM(nb_int);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2939 COPYNUM(nb_long);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2940 COPYNUM(nb_float);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2941 COPYNUM(nb_oct);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2942 COPYNUM(nb_hex);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2943 COPYNUM(nb_inplace_add);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2944 COPYNUM(nb_inplace_subtract);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2945 COPYNUM(nb_inplace_multiply);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2946 COPYNUM(nb_inplace_remainder);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2947 COPYNUM(nb_inplace_power);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2948 COPYNUM(nb_inplace_lshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2949 COPYNUM(nb_inplace_rshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2950 COPYNUM(nb_inplace_and);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2951 COPYNUM(nb_inplace_xor);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2952 COPYNUM(nb_inplace_or);
37191 4bfe8afe8f65 Get rid of remnants of integer division Neal Norwitz <nnorwitz@gmail.com> parents: 36925 diff changeset	2953 COPYNUM(nb_true_divide);
4bfe8afe8f65 Get rid of remnants of integer division Neal Norwitz <nnorwitz@gmail.com> parents: 36925 diff changeset	2954 COPYNUM(nb_floor_divide);
4bfe8afe8f65 Get rid of remnants of integer division Neal Norwitz <nnorwitz@gmail.com> parents: 36925 diff changeset	2955 COPYNUM(nb_inplace_true_divide);
4bfe8afe8f65 Get rid of remnants of integer division Neal Norwitz <nnorwitz@gmail.com> parents: 36925 diff changeset	2956 COPYNUM(nb_inplace_floor_divide);
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	2957 COPYNUM(nb_index);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2958 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2959
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2960 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	2961 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	2962 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	2963 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2964 COPYSEQ(sq_length);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2965 COPYSEQ(sq_concat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2966 COPYSEQ(sq_repeat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2967 COPYSEQ(sq_item);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2968 COPYSEQ(sq_slice);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2969 COPYSEQ(sq_ass_item);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2970 COPYSEQ(sq_ass_slice);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2971 COPYSEQ(sq_contains);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2972 COPYSEQ(sq_inplace_concat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2973 COPYSEQ(sq_inplace_repeat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2974 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2975
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2976 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	2977 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	2978 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	2979 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2980 COPYMAP(mp_length);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2981 COPYMAP(mp_subscript);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2982 COPYMAP(mp_ass_subscript);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2983 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2984
20384 2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2985 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	2986 basebase = base->tp_base;
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2987 if (basebase->tp_as_buffer == NULL)
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2988 basebase = NULL;
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2989 COPYBUF(bf_getreadbuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2990 COPYBUF(bf_getwritebuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2991 COPYBUF(bf_getsegcount);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2992 COPYBUF(bf_getcharbuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2993 }
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	2994
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	2995 basebase = base->tp_base;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2996
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2997 COPYSLOT(tp_dealloc);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2998 COPYSLOT(tp_print);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2999 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	3000 type->tp_getattr = base->tp_getattr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3001 type->tp_getattro = base->tp_getattro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3002 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3003 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	3004 type->tp_setattr = base->tp_setattr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3005 type->tp_setattro = base->tp_setattro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3006 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3007 /* tp_compare see tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3008 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	3009 /* tp_hash see tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3010 COPYSLOT(tp_call);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3011 COPYSLOT(tp_str);
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	3012 {
39623 c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3013 /* Copy comparison-related slots only when
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3014 not overriding them anywhere */
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3015 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	3016 type->tp_richcompare == NULL &&
39623 c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3017 type->tp_hash == NULL &&
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3018 !overrides_cmp_or_hash(type))
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3019 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3020 type->tp_compare = base->tp_compare;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3021 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	3022 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	3023 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3024 }
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	3025 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3026 COPYSLOT(tp_iter);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3027 COPYSLOT(tp_iternext);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3028 }
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	3029 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3030 COPYSLOT(tp_descr_get);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3031 COPYSLOT(tp_descr_set);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3032 COPYSLOT(tp_dictoffset);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3033 COPYSLOT(tp_init);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3034 COPYSLOT(tp_alloc);
22848 e589e473f232 Inherit tp_new and tp_is_gc. Guido van Rossum <guido@python.org> parents: 22834 diff changeset	3035 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	3036 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	3037 (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	3038 /* 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	3039 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	3040 }
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	3041 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	3042 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	3043 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	3044 /* 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	3045 * 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	3046 * 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	3047 * 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	3048 */
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	3049 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	3050 }
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	3051 /* 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	3052 * 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	3053 */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3054 }
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3055 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3056
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	3057 static int add_operators(PyTypeObject *);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3058
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3059 int
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	3060 PyType_Ready(PyTypeObject *type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3061 {
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3062 PyObject dict, bases;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3063 PyTypeObject *base;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3064 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3065
23756 8e5f26796620 Undo the last chunk of the previous patch, putting back a useful Guido van Rossum <guido@python.org> parents: 23755 diff changeset	3066 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	3067 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	3068 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	3069 }
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3070 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	3071
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3072 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	3073
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3074 #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	3075 /* 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	3076 * 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	3077 * 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	3078 * 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	3079 */
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28390 diff changeset	3080 _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	3081 #endif
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3082
22871 252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3083 /* 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	3084 base = type->tp_base;
33174 f6fa649fc4af Patch #980082: Missing INCREF in PyType_Ready. Martin v. Löwis <martin@v.loewis.de> parents: 32916 diff changeset	3085 if (base == NULL && type != &PyBaseObject_Type) {
22871 252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3086 base = type->tp_base = &PyBaseObject_Type;
33174 f6fa649fc4af Patch #980082: Missing INCREF in PyType_Ready. Martin v. Löwis <martin@v.loewis.de> parents: 32916 diff changeset	3087 Py_INCREF(base);
f6fa649fc4af Patch #980082: Missing INCREF in PyType_Ready. Martin v. Löwis <martin@v.loewis.de> parents: 32916 diff changeset	3088 }
22871 252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3089
36925 7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3090 /* Now the only way base can still be NULL is if type is
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3091 * &PyBaseObject_Type.
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3092 */
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3093
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	3094 /* Initialize the base class */
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3095 if (base != NULL && base->tp_dict == NULL) {
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	3096 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	3097 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	3098 }
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3099
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	3100 /* 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	3101 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	3102 initializing the ob_type field of their type objects. */
36925 7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3103 /* The test for base != NULL is really unnecessary, since base is only
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3104 NULL when type is &PyBaseObject_Type, and we know its ob_type is
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3105 not NULL (it's initialized to &PyType_Type). But coverity doesn't
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3106 know that. */
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3107 if (type->ob_type == NULL && base != 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	3108 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	3109
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3110 /* Initialize tp_bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3111 bases = type->tp_bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3112 if (bases == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3113 if (base == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3114 bases = PyTuple_New(0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3115 else
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	3116 bases = PyTuple_Pack(1, base);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3117 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	3118 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3119 type->tp_bases = bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3120 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3121
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3122 /* 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	3123 dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3124 if (dict == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3125 dict = PyDict_New();
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3126 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	3127 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	3128 type->tp_dict = dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3129 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3130
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3131 /* 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	3132 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	3133 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3134 if (type->tp_methods != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3135 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	3136 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3137 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3138 if (type->tp_members != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3139 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	3140 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3141 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3142 if (type->tp_getset != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3143 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	3144 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3145 }
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 /* Calculate method resolution order */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3148 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	3149 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3150 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3151
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3152 /* 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	3153 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	3154 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	3155
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3156 /* Initialize tp_dict properly */
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3157 bases = type->tp_mro;
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3158 assert(bases != NULL);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3159 assert(PyTuple_Check(bases));
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3160 n = PyTuple_GET_SIZE(bases);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3161 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	3162 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	3163 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	3164 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	3165 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3166
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	3167 /* 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	3168 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	3169 (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	3170 /* 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	3171 * 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	3172 */
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	3173 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	3174 "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	3175 "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	3176 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	3177 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	3178 }
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	3179
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3180 /* 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	3181 the tp_doc slot.
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3182 */
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3183 if (PyDict_GetItemString(type->tp_dict, "__doc__") == NULL) {
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3184 if (type->tp_doc != NULL) {
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3185 PyObject *doc = PyString_FromString(type->tp_doc);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3186 if (doc == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	3187 goto error;
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3188 PyDict_SetItemString(type->tp_dict, "__doc__", doc);
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3189 Py_DECREF(doc);
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3190 } else {
22774 02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	3191 PyDict_SetItemString(type->tp_dict,
02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	3192 "__doc__", Py_None);
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3193 }
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3194 }
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3195
39623 c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3196 /* Hack for tp_hash and __hash__.
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3197 If after all that, tp_hash is still NULL, and __hash__ is not in
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3198 tp_dict, set tp_dict['__hash__'] equal to None.
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3199 This signals that __hash__ is not inherited.
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3200 */
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3201 if (type->tp_hash == NULL) {
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3202 if (PyDict_GetItemString(type->tp_dict, "__hash__") == NULL) {
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3203 if (PyDict_SetItemString(type->tp_dict, "__hash__", Py_None) < 0)
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3204 goto error;
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3205 }
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3206 }
c6d9fa81f20f Change the way __hash__ is inherited; when __eq__ or __cmp__ is overridden Guido van Rossum <guido@python.org> parents: 39610 diff changeset	3207
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3208 /* 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	3209 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	3210 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	3211 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	3212 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	3213 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	3214 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	3215 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	3216 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	3217 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	3218 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	3219 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3220
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3221 /* 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	3222 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	3223 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	3224 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	3225 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	3226 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	3227 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	3228 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	3229 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 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 /* 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	3232 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	3233 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	3234 (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	3235 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	3236
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3237 error:
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3238 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	3239 return -1;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3240 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3241
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3242 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	3243 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	3244 {
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	3245 Py_ssize_t i;
d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	3246 int result;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3247 PyObject list, ref, *newobj;
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3248
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3249 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	3250 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	3251 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	3252 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	3253 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	3254 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3255 assert(PyList_Check(list));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3256 newobj = PyWeakref_NewRef((PyObject *)type, NULL);
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3257 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	3258 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	3259 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	3260 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	3261 if (PyWeakref_GET_OBJECT(ref) == Py_None)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3262 return PyList_SetItem(list, i, newobj);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3263 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3264 result = PyList_Append(list, newobj);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3265 Py_DECREF(newobj);
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	3266 return result;
20315 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
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3269 static void
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3270 remove_subclass(PyTypeObject base, PyTypeObject type)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3271 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3272 Py_ssize_t i;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3273 PyObject list, ref;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3274
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3275 list = base->tp_subclasses;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3276 if (list == NULL) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3277 return;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3278 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3279 assert(PyList_Check(list));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3280 i = PyList_GET_SIZE(list);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3281 while (--i >= 0) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3282 ref = PyList_GET_ITEM(list, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3283 assert(PyWeakref_CheckRef(ref));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3284 if (PyWeakref_GET_OBJECT(ref) == (PyObject*)type) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3285 /* this can't fail, right? */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3286 PySequence_DelItem(list, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3287 return;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3288 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3289 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3290 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3291
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3292 static int
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3293 check_num_args(PyObject *ob, int n)
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3294 {
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3295 if (!PyTuple_CheckExact(ob)) {
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3296 PyErr_SetString(PyExc_SystemError,
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3297 "PyArg_UnpackTuple() argument list is not a tuple");
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3298 return 0;
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3299 }
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3300 if (n == PyTuple_GET_SIZE(ob))
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3301 return 1;
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3302 PyErr_Format(
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3303 PyExc_TypeError,
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3304 "expected %d arguments, got %zd", n, PyTuple_GET_SIZE(ob));
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3305 return 0;
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3306 }
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3307
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3308 /* 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	3309
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3310 /* 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	3311 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	3312 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	3313 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	3314 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	3315
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3316 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3317 wrap_lenfunc(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	3318 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3319 lenfunc func = (lenfunc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3320 Py_ssize_t res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3321
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3322 if (!check_num_args(args, 0))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3323 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3324 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3325 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3326 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3327 return PyInt_FromLong((long)res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3328 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3329
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3330 static PyObject *
30670 7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3331 wrap_inquirypred(PyObject self, PyObject args, void *wrapped)
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3332 {
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3333 inquiry func = (inquiry)wrapped;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3334 int res;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3335
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3336 if (!check_num_args(args, 0))
30670 7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3337 return NULL;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3338 res = (*func)(self);
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3339 if (res == -1 && PyErr_Occurred())
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3340 return NULL;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3341 return PyBool_FromLong((long)res);
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3342 }
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3343
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3344 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3345 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	3346 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3347 binaryfunc func = (binaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3348 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3349
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3350 if (!check_num_args(args, 1))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3351 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3352 other = PyTuple_GET_ITEM(args, 0);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3353 return (*func)(self, other);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3354 }
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 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	3357 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	3358 {
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3359 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	3360 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	3361
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3362 if (!check_num_args(args, 1))
20328 26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3363 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3364 other = PyTuple_GET_ITEM(args, 0);
20328 26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3365 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	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
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3368 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3369 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	3370 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3371 binaryfunc func = (binaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3372 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3373
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3374 if (!check_num_args(args, 1))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3375 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3376 other = PyTuple_GET_ITEM(args, 0);
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	3377 if (!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	3378 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	3379 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	3380 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3381 return (*func)(other, self);
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
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3384 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3385 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	3386 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3387 ternaryfunc func = (ternaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3388 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3389 PyObject *third = Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3390
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3391 /* 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	3392
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3393 if (!PyArg_UnpackTuple(args, "", 1, 2, &other, &third))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3394 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3395 return (*func)(self, other, third);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3396 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3397
20168 091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3398 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	3399 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	3400 {
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3401 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	3402 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	3403 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	3404
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3405 /* 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	3406
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3407 if (!PyArg_UnpackTuple(args, "", 1, 2, &other, &third))
20168 091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3408 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	3409 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	3410 }
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3411
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3412 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3413 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	3414 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3415 unaryfunc func = (unaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3416
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3417 if (!check_num_args(args, 0))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3418 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3419 return (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3420 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3421
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3422 static PyObject *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3423 wrap_indexargfunc(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	3424 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3425 ssizeargfunc func = (ssizeargfunc)wrapped;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3426 PyObject* o;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3427 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3428
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3429 if (!PyArg_UnpackTuple(args, "", 1, 1, &o))
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3430 return NULL;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	3431 i = PyNumber_AsSsize_t(o, PyExc_OverflowError);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3432 if (i == -1 && PyErr_Occurred())
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3433 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3434 return (*func)(self, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3435 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3436
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3437 static Py_ssize_t
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3438 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	3439 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3440 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3441
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	3442 i = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3443 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	3444 return -1;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3445 if (i < 0) {
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3446 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	3447 if (sq && sq->sq_length) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3448 Py_ssize_t n = (*sq->sq_length)(self);
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3449 if (n < 0)
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3450 return -1;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3451 i += n;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3452 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3453 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3454 return i;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3455 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3456
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3457 static PyObject *
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3458 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	3459 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3460 ssizeargfunc func = (ssizeargfunc)wrapped;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3461 PyObject *arg;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3462 Py_ssize_t i;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3463
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3464 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	3465 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	3466 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	3467 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	3468 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3469 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	3470 }
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3471 check_num_args(args, 1);
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	3472 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	3473 return NULL;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3474 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3475
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3476 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3477 wrap_ssizessizeargfunc(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	3478 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3479 ssizessizeargfunc func = (ssizessizeargfunc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3480 Py_ssize_t i, j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3481
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3482 if (!PyArg_ParseTuple(args, "nn", &i, &j))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3483 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3484 return (*func)(self, i, j);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3485 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3486
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3487 static PyObject *
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3488 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	3489 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3490 ssizeobjargproc func = (ssizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3491 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3492 int res;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3493 PyObject arg, value;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3494
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3495 if (!PyArg_UnpackTuple(args, "", 2, 2, &arg, &value))
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3496 return NULL;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3497 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	3498 if (i == -1 && PyErr_Occurred())
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3499 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3500 res = (*func)(self, i, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3501 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3502 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3503 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3504 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3505 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3506
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3507 static PyObject *
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3508 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	3509 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3510 ssizeobjargproc func = (ssizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3511 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3512 int res;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3513 PyObject *arg;
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3514
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3515 if (!check_num_args(args, 1))
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3516 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3517 arg = PyTuple_GET_ITEM(args, 0);
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	3518 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	3519 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	3520 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3521 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	3522 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	3523 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3524 Py_INCREF(Py_None);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3525 return Py_None;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3526 }
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3527
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3528 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3529 wrap_ssizessizeobjargproc(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	3530 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3531 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3532 Py_ssize_t i, j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3533 int res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3534 PyObject *value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3535
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3536 if (!PyArg_ParseTuple(args, "nnO", &i, &j, &value))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3537 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3538 res = (*func)(self, i, j, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3539 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3540 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3541 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3542 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3543 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3544
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3545 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	3546 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	3547 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3548 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3549 Py_ssize_t i, j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3550 int res;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3551
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3552 if (!PyArg_ParseTuple(args, "nn", &i, &j))
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3553 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	3554 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	3555 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	3556 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	3557 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	3558 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	3559 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3560
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3561 /* 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	3562 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3563 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	3564 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3565 objobjproc func = (objobjproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3566 int res;
30660 36992ca918a3 Fix leak introduced by previous typeobject.c checkin. Guido van Rossum <guido@python.org> parents: 30659 diff changeset	3567 PyObject *value;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3568
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3569 if (!check_num_args(args, 1))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3570 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3571 value = PyTuple_GET_ITEM(args, 0);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3572 res = (*func)(self, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3573 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3574 return NULL;
30660 36992ca918a3 Fix leak introduced by previous typeobject.c checkin. Guido van Rossum <guido@python.org> parents: 30659 diff changeset	3575 else
36992ca918a3 Fix leak introduced by previous typeobject.c checkin. Guido van Rossum <guido@python.org> parents: 30659 diff changeset	3576 return PyBool_FromLong(res);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3577 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3578
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3579 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3580 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	3581 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3582 objobjargproc func = (objobjargproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3583 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3584 PyObject key, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3585
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3586 if (!PyArg_UnpackTuple(args, "", 2, 2, &key, &value))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3587 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3588 res = (*func)(self, key, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3589 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3590 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3591 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3592 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3593 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3594
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3595 static PyObject *
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3596 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	3597 {
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3598 objobjargproc func = (objobjargproc)wrapped;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3599 int res;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3600 PyObject *key;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3601
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3602 if (!check_num_args(args, 1))
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3603 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3604 key = PyTuple_GET_ITEM(args, 0);
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3605 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	3606 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	3607 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3608 Py_INCREF(Py_None);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3609 return Py_None;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3610 }
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3611
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3612 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3613 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	3614 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3615 cmpfunc func = (cmpfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3616 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3617 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3618
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3619 if (!check_num_args(args, 1))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3620 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3621 other = PyTuple_GET_ITEM(args, 0);
20063 9a599b1d9d1c Another comparison patch-up: comparing a type with a dynamic metatype Guido van Rossum <guido@python.org> parents: 20056 diff changeset	3622 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	3623 !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	3624 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	3625 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	3626 "%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	3627 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	3628 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	3629 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	3630 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	3631 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3632 res = (*func)(self, other);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3633 if (PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3634 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3635 return PyInt_FromLong((long)res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3636 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3637
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3638 /* 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	3639 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	3640 static int
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3641 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	3642 {
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3643 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	3644 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	3645 type = type->tp_base;
36925 7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3646 /* If type is NULL now, this is a really weird type.
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3647 In the same of backwards compatibility (?), just shut up. */
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3648 if (type && type->tp_setattro != func) {
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3649 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	3650 "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	3651 what,
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3652 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	3653 return 0;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3654 }
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3655 return 1;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3656 }
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3657
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3658 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3659 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	3660 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3661 setattrofunc func = (setattrofunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3662 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3663 PyObject name, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3664
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3665 if (!PyArg_UnpackTuple(args, "", 2, 2, &name, &value))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3666 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	3667 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	3668 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3669 res = (*func)(self, name, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3670 if (res < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3671 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3672 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3673 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3674 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3675
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3676 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3677 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	3678 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3679 setattrofunc func = (setattrofunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3680 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3681 PyObject *name;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3682
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3683 if (!check_num_args(args, 1))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3684 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3685 name = PyTuple_GET_ITEM(args, 0);
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	3686 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	3687 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3688 res = (*func)(self, name, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3689 if (res < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3690 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3691 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3692 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3693 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3694
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3695 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3696 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	3697 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3698 hashfunc func = (hashfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3699 long res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3700
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3701 if (!check_num_args(args, 0))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3702 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3703 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3704 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3705 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3706 return PyInt_FromLong(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3707 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3708
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3709 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	3710 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	3711 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3712 ternaryfunc func = (ternaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3713
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	3714 return (*func)(self, args, kwds);
18933 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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3717 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3718 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	3719 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3720 richcmpfunc func = (richcmpfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3721 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3722
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3723 if (!check_num_args(args, 1))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3724 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3725 other = PyTuple_GET_ITEM(args, 0);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3726 return (*func)(self, other, op);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3727 }
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 #undef RICHCMP_WRAPPER
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3730 #define RICHCMP_WRAPPER(NAME, OP) \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3731 static PyObject * \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3732 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	3733 { \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3734 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	3735 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3736
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	3737 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	3738 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	3739 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	3740 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	3741 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	3742 RICHCMP_WRAPPER(ge, Py_GE)
18933 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 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3745 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	3746 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3747 unaryfunc func = (unaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3748 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3749
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3750 if (!check_num_args(args, 0))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3751 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3752 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3753 if (res == NULL && !PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3754 PyErr_SetNone(PyExc_StopIteration);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3755 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3756 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3757
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3758 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3759 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	3760 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3761 descrgetfunc func = (descrgetfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3762 PyObject *obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3763 PyObject *type = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3764
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3765 if (!PyArg_UnpackTuple(args, "", 1, 2, &obj, &type))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3766 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	3767 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	3768 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	3769 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	3770 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	3771 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	3772 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	3773 "__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	3774 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	3775 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3776 return (*func)(self, obj, type);
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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3779 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	3780 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	3781 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3782 descrsetfunc func = (descrsetfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3783 PyObject obj, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3784 int ret;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3785
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3786 if (!PyArg_UnpackTuple(args, "", 2, 2, &obj, &value))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3787 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3788 ret = (*func)(self, obj, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3789 if (ret < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3790 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3791 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3792 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3793 }
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	3794
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3795 static PyObject *
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3796 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	3797 {
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3798 descrsetfunc func = (descrsetfunc)wrapped;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3799 PyObject *obj;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3800 int ret;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3801
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3802 if (!check_num_args(args, 1))
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3803 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3804 obj = PyTuple_GET_ITEM(args, 0);
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3805 ret = (*func)(self, obj, NULL);
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3806 if (ret < 0)
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3807 return NULL;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3808 Py_INCREF(Py_None);
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3809 return Py_None;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	3810 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3811
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3812 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	3813 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	3814 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3815 initproc func = (initproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3816
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	3817 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	3818 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3819 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3820 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3821 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3822
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3823 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	3824 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	3825 {
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3826 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	3827 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	3828
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3829 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	3830 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	3831 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	3832 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	3833 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	3834 "%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	3835 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	3836 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	3837 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3838 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	3839 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	3840 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	3841 "%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	3842 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3843 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	3844 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	3845 }
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 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	3847 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	3848 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	3849 "%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	3850 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3851 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3852 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3853 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	3854 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	3855 }
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3856
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3857 /* 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	3858 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	3859 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	3860 staticbase = subtype;
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3861 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	3862 staticbase = staticbase->tp_base;
36925 7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3863 /* If staticbase is NULL now, it is a really weird type.
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3864 In the same of backwards compatibility (?), just shut up. */
7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3865 if (staticbase && 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	3866 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	3867 "%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	3868 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3869 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3870 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	3871 return NULL;
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3872 }
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	3873
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	3874 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	3875 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	3876 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	3877 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	3878 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	3879 return res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3880 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3881
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	3882 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	3883 {"__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	3884 PyDoc_STR("T.__new__(S, ...) -> "
452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	3885 "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	3886 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3887 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3888
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3889 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	3890 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	3891 {
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3892 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	3893
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3894 if (PyDict_GetItemString(type->tp_dict, "__new__") != NULL)
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3895 return 0;
3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3896 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	3897 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	3898 return -1;
32407 aaf9295ed45b Cosmetic spacing fix. Raymond Hettinger <python@rcn.com> parents: 32404 diff changeset	3899 if (PyDict_SetItemString(type->tp_dict, "__new__", func)) {
32404 75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	3900 Py_DECREF(func);
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	3901 return -1;
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	3902 }
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	3903 Py_DECREF(func);
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	3904 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	3905 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	3906
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3907 /* Slot wrappers that call the corresponding __foo__ slot. See comments
3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	3908 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	3909
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3910 #define SLOT0(FUNCNAME, OPSTR) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3911 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3912 FUNCNAME(PyObject *self) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3913 { \
19540 e141b392b61d Fix a typo in SLOT0 macro for the declaration of cache_str. Guido van Rossum <guido@python.org> parents: 19538 diff changeset	3914 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	3915 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	3916 }
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3917
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3918 #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	3919 static PyObject * \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3920 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	3921 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	3922 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	3923 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	3924 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3925
27124 d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3926 /* 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	3927 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	3928 static int
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3929 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	3930 {
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3931 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	3932 int ok;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3933
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3934 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	3935 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	3936 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3937 /* 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	3938 return 0;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3939 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3940
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3941 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	3942 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	3943 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3944 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	3945 /* 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	3946 return 1;
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
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3949 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	3950 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	3951 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	3952 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	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 return 0;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3955 }
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 return ok;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3958 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	3959
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3960
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3961 #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	3962 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3963 FUNCNAME(PyObject self, PyObject other) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3964 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	3965 static PyObject cache_str, rcache_str; \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3966 int do_other = self->ob_type != other->ob_type && \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3967 other->ob_type->tp_as_number != NULL && \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3968 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	3969 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	3970 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	3971 PyObject *r; \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3972 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	3973 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	3974 method_is_overloaded(self, other, ROPSTR)) { \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3975 r = call_maybe( \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3976 other, ROPSTR, &rcache_str, "(O)", self); \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3977 if (r != Py_NotImplemented) \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3978 return r; \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3979 Py_DECREF(r); \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3980 do_other = 0; \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3981 } \
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	3982 r = call_maybe( \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	3983 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	3984 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	3985 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	3986 return r; \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3987 Py_DECREF(r); \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3988 } \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	3989 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	3990 return call_maybe( \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	3991 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	3992 } \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3993 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	3994 return Py_NotImplemented; \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3995 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3996
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3997 #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	3998 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	3999
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4000 #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	4001 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4002 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	4003 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4004 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4005 return call_method(self, OPSTR, &cache_str, \
cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4006 "(" ARGCODES ")", arg1, arg2); \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4007 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4008
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4009 static Py_ssize_t
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4010 slot_sq_length(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4011 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4012 static PyObject *len_str;
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4013 PyObject *res = call_method(self, "__len__", &len_str, "()");
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4014 Py_ssize_t len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4015
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4016 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4017 return -1;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	4018 len = PyInt_AsSsize_t(res);
20197 b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4019 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	4020 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	4021 return -1;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	4022 #if SIZEOF_SIZE_T < SIZEOF_INT
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4023 /* Overflow check -- range of PyInt is more than C ssize_t */
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	4024 if (len != (int)len) {
35610 1f236e598ae9 - On 64-bit platforms, when __len__() returns a value that cannot be Guido van Rossum <guido@python.org> parents: 35004 diff changeset	4025 PyErr_SetString(PyExc_OverflowError,
1f236e598ae9 - On 64-bit platforms, when __len__() returns a value that cannot be Guido van Rossum <guido@python.org> parents: 35004 diff changeset	4026 "__len__() should return 0 <= outcome < 2**31");
1f236e598ae9 - On 64-bit platforms, when __len__() returns a value that cannot be Guido van Rossum <guido@python.org> parents: 35004 diff changeset	4027 return -1;
1f236e598ae9 - On 64-bit platforms, when __len__() returns a value that cannot be Guido van Rossum <guido@python.org> parents: 35004 diff changeset	4028 }
1f236e598ae9 - On 64-bit platforms, when __len__() returns a value that cannot be Guido van Rossum <guido@python.org> parents: 35004 diff changeset	4029 #endif
24376 aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4030 if (len < 0) {
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	4031 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	4032 "__len__() should return >= 0");
aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4033 return -1;
aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4034 }
20197 b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4035 return len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4036 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4037
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4038 /* 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	4039 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	4040 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4041 slot_sq_item(PyObject *self, Py_ssize_t i)
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4042 {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4043 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	4044 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	4045 descrgetfunc f;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4046
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4047 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	4048 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	4049 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	4050 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4051 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4052 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	4053 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	4054 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	4055 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	4056 else {
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4057 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	4058 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	4059 return NULL;
680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4060 }
680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4061 }
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	4062 ival = PyInt_FromSsize_t(i);
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4063 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	4064 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	4065 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	4066 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	4067 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	4068 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	4069 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	4070 return retval;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4071 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4072 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4073 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4074 else {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4075 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	4076 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4077 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	4078 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	4079 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	4080 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4081 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4082
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4083 SLOT2(slot_sq_slice, "__getslice__", Py_ssize_t, Py_ssize_t, "nn")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4084
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4085 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4086 slot_sq_ass_item(PyObject self, Py_ssize_t index, PyObject value)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4087 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4088 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	4089 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	4090
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4091 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	4092 res = call_method(self, "__delitem__", &delitem_str,
37881 702d85d9418a Merge trunk up to 45598. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4093 "(n)", index);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4094 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4095 res = call_method(self, "__setitem__", &setitem_str,
37881 702d85d9418a Merge trunk up to 45598. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4096 "(nO)", index, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4097 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4098 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4099 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4100 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4101 }
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 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4104 slot_sq_ass_slice(PyObject self, Py_ssize_t i, Py_ssize_t j, PyObject value)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4105 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4106 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	4107 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	4108
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4109 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	4110 res = call_method(self, "__delslice__", &delslice_str,
37881 702d85d9418a Merge trunk up to 45598. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4111 "(nn)", i, j);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4112 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4113 res = call_method(self, "__setslice__", &setslice_str,
37881 702d85d9418a Merge trunk up to 45598. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4114 "(nnO)", i, j, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4115 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4116 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4117 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4118 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4119 }
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 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4122 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	4123 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4124 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	4125 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	4126
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	4127 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	4128
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4129 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	4130 if (func != NULL) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	4131 args = PyTuple_Pack(1, value);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4132 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4133 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4134 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4135 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	4136 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4137 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4138 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	4139 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	4140 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	4141 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	4142 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4143 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4144 else if (! PyErr_Occurred()) {
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4145 /* Possible results: -1 and 1 */
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4146 result = (int)_PySequence_IterSearch(self, value,
28390 33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4147 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	4148 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4149 return result;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4150 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4151
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4152 #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	4153
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4154 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	4155
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4156 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4157 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	4158 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4159 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	4160 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	4161
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4162 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	4163 res = call_method(self, "__delitem__", &delitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4164 "(O)", key);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4165 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4166 res = call_method(self, "__setitem__", &setitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4167 "(OO)", key, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4168 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4169 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4170 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4171 return 0;
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
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4174 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	4175 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	4176 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	4177 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	4178 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	4179
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	4180 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	4181
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4182 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	4183 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	4184
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4185 static PyObject *
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4186 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	4187 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4188 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	4189
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4190 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	4191 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	4192 /* 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	4193 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	4194 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	4195 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	4196 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	4197 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	4198 "(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	4199 }
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4200 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	4201 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	4202 }
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4203
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4204 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	4205 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	4206 SLOT0(slot_nb_absolute, "__abs__")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4207
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4208 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4209 slot_nb_nonzero(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4210 {
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4211 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	4212 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	4213 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	4214
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4215 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	4216 if (func == NULL) {
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4217 if (PyErr_Occurred())
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4218 return -1;
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4219 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	4220 if (func == NULL)
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4221 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	4222 }
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4223 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	4224 if (args != NULL) {
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4225 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	4226 Py_DECREF(args);
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4227 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	4228 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	4229 result = PyObject_IsTrue(temp);
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4230 else {
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4231 PyErr_Format(PyExc_TypeError,
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4232 "__nonzero__ should return "
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4233 "bool or int, returned %s",
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4234 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	4235 result = -1;
29607 60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4236 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4237 Py_DECREF(temp);
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4238 }
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4239 }
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4240 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	4241 return result;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4242 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4243
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4244
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	4245 static PyObject *
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4246 slot_nb_index(PyObject *self)
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4247 {
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4248 static PyObject *index_str;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	4249 return call_method(self, "__index__", &index_str, "()");
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4250 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4251
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4252
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4253 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	4254 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	4255 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	4256 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	4257 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	4258 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	4259
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4260 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	4261 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	4262 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	4263 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	4264 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	4265 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	4266 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	4267 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	4268 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	4269 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	4270 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	4271 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	4272 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	4273 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	4274 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	4275 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	4276 "__floordiv__", "__rfloordiv__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4277 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	4278 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	4279 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	4280
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4281 static int
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4282 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	4283 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4284 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	4285 static PyObject *cmp_str;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4286 Py_ssize_t c;
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4287
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	4288 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	4289 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4290 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4291 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4292 else {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	4293 args = PyTuple_Pack(1, other);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4294 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4295 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4296 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4297 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	4298 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4299 }
23967 1a8096bb4c48 Fix SF bug 572567: Memory leak in object comparison. Raymond Hettinger <python@rcn.com> parents: 23950 diff changeset	4300 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	4301 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	4302 if (res == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4303 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4304 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	4305 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4306 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	4307 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4308 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	4309 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4310 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4311 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4312 return 2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4313 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4314
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4315 /* 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	4316 int
f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4317 _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	4318 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4319 int c;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4320
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4321 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	4322 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	4323 if (c <= 1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4324 return c;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4325 }
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4326 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	4327 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	4328 if (c < -1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4329 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4330 if (c <= 1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4331 return -c;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4332 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4333 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	4334 (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	4335 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4336
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4337 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4338 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	4339 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4340 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	4341 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	4342
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	4343 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	4344 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4345 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	4346 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4347 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4348 }
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	4349 PyErr_Clear();
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	4350 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	4351 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	4352 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4353
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4354 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4355 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	4356 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4357 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	4358 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	4359
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	4360 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	4361 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4362 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	4363 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4364 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4365 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4366 else {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4367 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4368 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	4369 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4370 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4371
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4372 static long
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4373 slot_tp_hash(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4374 {
39548 67e45704c07e Fix non-C89-compatible syntax. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	4375 PyObject func, res;
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4376 static PyObject *hash_str;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4377 long h;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4378
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	4379 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	4380
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4381 if (func == Py_None) {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4382 Py_DECREF(func);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4383 func = NULL;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4384 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4385
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4386 if (func == NULL) {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4387 PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'",
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4388 self->ob_type->tp_name);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4389 return -1;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4390 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4391
39548 67e45704c07e Fix non-C89-compatible syntax. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	4392 res = PyEval_CallObject(func, NULL);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4393 Py_DECREF(func);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4394 if (res == NULL)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4395 return -1;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4396 if (PyLong_Check(res))
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4397 h = PyLong_Type.tp_hash(res);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4398 else
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4399 h = PyInt_AsLong(res);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4400 Py_DECREF(res);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4401 if (h == -1 && !PyErr_Occurred())
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4402 h = -2;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	4403 return h;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4404 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4405
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4406 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4407 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	4408 {
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	4409 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	4410 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	4411 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4412
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4413 if (meth == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4414 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4415
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4416 /* PyObject_Call() will end up calling slot_tp_call() again if
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4417 the object returned for __call__ has __call__ itself defined
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4418 upon it. This can be an infinite recursion if you set
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4419 __call__ in a class to an instance of it. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4420 if (Py_EnterRecursiveCall(" in __call__")) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4421 Py_DECREF(meth);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4422 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4423 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4424 res = PyObject_Call(meth, args, kwds);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4425 Py_LeaveRecursiveCall();
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4426
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4427 Py_DECREF(meth);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4428 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4429 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4430
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	4431 /* 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	4432
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	4433 - 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	4434 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	4435
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	4436 - 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	4437
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4438 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	4439 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	4440 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	4441
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4442 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4443 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	4444 {
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	4445 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	4446 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	4447 "(O)", name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4448 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4449
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4450 static PyObject *
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4451 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	4452 {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4453 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	4454 PyObject getattr, getattribute, *res;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4455 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	4456 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	4457
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4458 if (getattr_str == NULL) {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4459 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	4460 if (getattr_str == NULL)
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4461 return NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4462 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4463 if (getattribute_str == NULL) {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4464 getattribute_str =
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4465 PyString_InternFromString("__getattribute__");
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4466 if (getattribute_str == NULL)
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4467 return NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4468 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4469 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	4470 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	4471 /* 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	4472 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	4473 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	4474 }
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4475 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	4476 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	4477 (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	4478 ((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	4479 (void *)PyObject_GenericGetAttr))
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4480 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	4481 else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37881 diff changeset	4482 res = PyObject_CallFunctionObjArgs(getattribute, self, name, NULL);
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	4483 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	4484 PyErr_Clear();
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37881 diff changeset	4485 res = PyObject_CallFunctionObjArgs(getattr, self, name, NULL);
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4486 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4487 return res;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4488 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	4489
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4490 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4491 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	4492 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4493 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	4494 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	4495
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4496 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	4497 res = call_method(self, "__delattr__", &delattr_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4498 "(O)", name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4499 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4500 res = call_method(self, "__setattr__", &setattr_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4501 "(OO)", name, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4502 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4503 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4504 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4505 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4506 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4507
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4508 static PyObject *
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4509 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	4510 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4511 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	4512 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	4513
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	4514 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	4515 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4516 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4517 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	4518 return Py_NotImplemented;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4519 }
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	4520 args = PyTuple_Pack(1, other);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4521 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4522 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4523 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4524 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	4525 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4526 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4527 Py_DECREF(func);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4528 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4529 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4530
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4531 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4532 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	4533 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4534 PyObject *res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4535
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4536 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	4537 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	4538 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	4539 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4540 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4541 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4542 if (other->ob_type->tp_richcompare == slot_tp_richcompare) {
33541 781aef974463 A static swapped_op[] array was defined in 3 different C files, & I think Tim Peters <tim.peters@gmail.com> parents: 33174 diff changeset	4543 res = half_richcompare(other, self, _Py_SwappedOp[op]);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4544 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	4545 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4546 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4547 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4548 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4549 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	4550 return Py_NotImplemented;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4551 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4552
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4553 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4554 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	4555 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4556 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	4557 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	4558
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	4559 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	4560 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	4561 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	4562 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	4563 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	4564 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	4565 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	4566 }
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	4567 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	4568 return res;
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4569 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4570 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	4571 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	4572 if (func == NULL) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4573 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4574 "'%.200s' object is not iterable",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4575 self->ob_type->tp_name);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4576 return NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4577 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4578 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4579 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	4580 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4581
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4582 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4583 slot_tp_iternext(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4584 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4585 static PyObject *next_str;
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4586 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	4587 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4588
19339 6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4589 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	4590 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	4591 {
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4592 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	4593 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	4594 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	4595
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4596 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	4597 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	4598 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	4599 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	4600 }
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4601 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	4602 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	4603 /* 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	4604 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	4605 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	4606 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	4607 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	4608 }
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	4609 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	4610 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	4611 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	4612 type = Py_None;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37881 diff changeset	4613 return PyObject_CallFunctionObjArgs(get, self, obj, type, NULL);
19339 6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	4614 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4615
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4616 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4617 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	4618 {
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	4619 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	4620 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	4621
45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	4622 if (value == NULL)
21142 842b280421ba Fix for SF bug #485678. Guido van Rossum <guido@python.org> parents: 20978 diff changeset	4623 res = call_method(self, "__delete__", &del_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4624 "(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	4625 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4626 res = call_method(self, "__set__", &set_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4627 "(OO)", target, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4628 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4629 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4630 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4631 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4632 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4633
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4634 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4635 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	4636 {
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	4637 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	4638 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	4639 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4640
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4641 if (meth == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4642 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4643 res = PyObject_Call(meth, args, kwds);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4644 Py_DECREF(meth);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4645 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4646 return -1;
34668 9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	4647 if (res != Py_None) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4648 PyErr_Format(PyExc_TypeError,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4649 "__init__() should return None, not '%.200s'",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	4650 res->ob_type->tp_name);
34668 9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	4651 Py_DECREF(res);
9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	4652 return -1;
9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	4653 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4654 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4655 return 0;
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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4658 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4659 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	4660 {
24680 6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4661 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	4662 PyObject *func;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4663 PyObject newargs, x;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4664 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4665
24680 6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4666 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	4667 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	4668 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	4669 return NULL;
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4670 }
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	4671 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	4672 if (func == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4673 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4674 assert(PyTuple_Check(args));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4675 n = PyTuple_GET_SIZE(args);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4676 newargs = PyTuple_New(n+1);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4677 if (newargs == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4678 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4679 Py_INCREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4680 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	4681 for (i = 0; i < n; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4682 x = PyTuple_GET_ITEM(args, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4683 Py_INCREF(x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4684 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	4685 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4686 x = PyObject_Call(func, newargs, kwds);
20195 3408d929bb94 slot_tp_new(): newargs was leaking. Guido van Rossum <guido@python.org> parents: 20190 diff changeset	4687 Py_DECREF(newargs);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4688 Py_DECREF(func);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4689 return x;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4690 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4691
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4692 static void
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4693 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	4694 {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4695 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	4696 PyObject del, res;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4697 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	4698
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4699 /* 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	4700 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	4701 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	4702
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4703 /* 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	4704 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	4705
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4706 /* 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	4707 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	4708 if (del != NULL) {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4709 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	4710 if (res == NULL)
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4711 PyErr_WriteUnraisable(del);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4712 else
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4713 Py_DECREF(res);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4714 Py_DECREF(del);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4715 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4716
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4717 /* 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	4718 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	4719
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4720 /* 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	4721 * 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	4722 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4723 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	4724 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	4725 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	4726
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4727 /* __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	4728 * never happened.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4729 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4730 {
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4731 Py_ssize_t refcnt = self->ob_refcnt;
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4732 _Py_NewReference(self);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4733 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	4734 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4735 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	4736 _Py_AS_GC(self)->gc.gc_refs != _PyGC_REFS_UNTRACKED);
32916 ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 32407 diff changeset	4737 /* If Py_REF_DEBUG, _Py_NewReference bumped _Py_RefTotal, so
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 32407 diff changeset	4738 * we need to undo that. */
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 32407 diff changeset	4739 _Py_DEC_REFTOTAL;
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 32407 diff changeset	4740 /* If Py_TRACE_REFS, _Py_NewReference re-added self to the object
ff77727555ae Repair the same thinko in two places about handling of _Py_RefTotal in Michael W. Hudson <mwh@python.net> parents: 32407 diff changeset	4741 * chain, so no more to do there.
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4742 * 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	4743 * _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	4744 * undone.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4745 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4746 #ifdef COUNT_ALLOCS
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4747 --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	4748 --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	4749 #endif
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4750 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	4751
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4752
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4753 /* 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	4754 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	4755 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	4756 sequences and mappings.
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	4757 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	4758 __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	4759 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	4760 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	4761 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	4762
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4763 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	4764
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4765 #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	4766 #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	4767 #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	4768 #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	4769 #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	4770 #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	4771 #undef UNSLOT
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4772 #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	4773 #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	4774 #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	4775
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4776 #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	4777 {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	4778 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	4779 #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	4780 {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	4781 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	4782 #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	4783 {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	4784 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	4785 #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	4786 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	4787 #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	4788 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	4789 #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	4790 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	4791 #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	4792 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	4793 "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	4794 #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	4795 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	4796 "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	4797 #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	4798 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	4799 "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	4800 #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	4801 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	4802 "x." NAME "(y) <==> y" DOC "x")
35004 8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4803 #define BINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4804 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_l, \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4805 "x." NAME "(y) <==> " DOC)
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4806 #define RBINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4807 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_r, \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4808 "x." NAME "(y) <==> " DOC)
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4809
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4810 static slotdef slotdefs[] = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4811 SQSLOT("__len__", sq_length, slot_sq_length, wrap_lenfunc,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4812 "x.__len__() <==> len(x)"),
36150 2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4813 /* Heap types defining __add__/__mul__ have sq_concat/sq_repeat == NULL.
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4814 The logic in abstract.c always falls back to nb_add/nb_multiply in
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4815 this case. Defining both the nb_* and the sq_* slots to call the
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4816 user-defined methods has unexpected side-effects, as shown by
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4817 test_descr.notimplemented() */
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4818 SQSLOT("__add__", sq_concat, NULL, wrap_binaryfunc,
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4819 "x.__add__(y) <==> x+y"),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	4820 SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc,
36150 2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4821 "x.__mul__(n) <==> x*n"),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	4822 SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc,
36150 2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4823 "x.__rmul__(n) <==> n*x"),
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4824 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	4825 "x.__getitem__(y) <==> x[y]"),
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4826 SQSLOT("__getslice__", sq_slice, slot_sq_slice, wrap_ssizessizeargfunc,
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	4827 "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	4828 \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	4829 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	4830 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	4831 "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	4832 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	4833 "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	4834 SQSLOT("__setslice__", sq_ass_slice, slot_sq_ass_slice,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4835 wrap_ssizessizeobjargproc,
29173 421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4836 "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	4837 \n\
421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	4838 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	4839 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	4840 "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	4841 \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	4842 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	4843 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	4844 "x.__contains__(y) <==> y in x"),
36150 2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4845 SQSLOT("__iadd__", sq_inplace_concat, NULL,
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4846 wrap_binaryfunc, "x.__iadd__(y) <==> x+=y"),
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	4847 SQSLOT("__imul__", sq_inplace_repeat, NULL,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	4848 wrap_indexargfunc, "x.__imul__(y) <==> x*=y"),
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4849
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4850 MPSLOT("__len__", mp_length, slot_mp_length, wrap_lenfunc,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4851 "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	4852 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	4853 wrap_binaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4854 "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	4855 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	4856 wrap_objobjargproc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4857 "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	4858 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	4859 wrap_delitem,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4860 "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	4861
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4862 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	4863 "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4864 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	4865 "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4866 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	4867 "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4868 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	4869 "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4870 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	4871 "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4872 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	4873 "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4874 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	4875 "%"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4876 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	4877 "%"),
35004 8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4878 BINSLOTNOTINFIX("__divmod__", nb_divmod, slot_nb_divmod,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4879 "divmod(x, y)"),
35004 8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	4880 RBINSLOTNOTINFIX("__rdivmod__", nb_divmod, slot_nb_divmod,
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4881 "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	4882 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	4883 "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	4884 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	4885 "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	4886 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	4887 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	4888 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	4889 "abs(x)"),
30670 7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	4890 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	4891 "x != 0"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4892 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	4893 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	4894 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	4895 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	4896 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	4897 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	4898 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	4899 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	4900 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	4901 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	4902 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	4903 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	4904 "int(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4905 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	4906 "long(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4907 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	4908 "float(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4909 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	4910 "oct(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4911 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	4912 "hex(x)"),
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39603 diff changeset	4913 NBSLOT("__index__", nb_index, slot_nb_index, wrap_unaryfunc,
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4914 "x[y:z] <==> x[y.__index__():z.__index__()]"),
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4915 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	4916 wrap_binaryfunc, "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4917 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	4918 wrap_binaryfunc, "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4919 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	4920 wrap_binaryfunc, "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4921 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	4922 wrap_binaryfunc, "%"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4923 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	4924 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	4925 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	4926 wrap_binaryfunc, "<<"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4927 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	4928 wrap_binaryfunc, ">>"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4929 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	4930 wrap_binaryfunc, "&"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4931 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	4932 wrap_binaryfunc, "^"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4933 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	4934 wrap_binaryfunc, "\|"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4935 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	4936 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	4937 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	4938 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	4939 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	4940 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	4941 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	4942 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	4943
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	4944 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	4945 "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	4946 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	4947 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	4948 "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	4949 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	4950 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	4951 "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	4952 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	4953 "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	4954 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	4955 "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	4956 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	4957 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	4958 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	4959 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	4960 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	4961 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	4962 "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	4963 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	4964 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	4965 "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	4966 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	4967 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	4968 "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	4969 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	4970 "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	4971 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	4972 "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	4973 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	4974 "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	4975 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	4976 "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	4977 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	4978 "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	4979 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	4980 "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	4981 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	4982 "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	4983 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	4984 "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	4985 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	4986 "descr.__set__(obj, value)"),
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4987 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	4988 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	4989 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	4990 "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	4991 "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	4992 PyWrapperFlag_KEYWORDS),
ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	4993 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	4994 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	4995 {NULL}
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4996 };
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4997
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	4998 /* 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	4999 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	5000 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	5001 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	5002 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	5003 static void **
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5004 slotptr(PyTypeObject *type, int ioffset)
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5005 {
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5006 char *ptr;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5007 long offset = ioffset;
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5008
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5009 /* 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	5010 assert(offset >= 0);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5011 assert((size_t)offset < offsetof(PyHeapTypeObject, as_buffer));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5012 if ((size_t)offset >= offsetof(PyHeapTypeObject, as_sequence)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5013 ptr = (char *)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	5014 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	5015 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5016 else if ((size_t)offset >= offsetof(PyHeapTypeObject, as_mapping)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5017 ptr = (char *)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	5018 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	5019 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5020 else if ((size_t)offset >= offsetof(PyHeapTypeObject, as_number)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5021 ptr = (char *)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	5022 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	5023 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5024 else {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5025 ptr = (char *)type;
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5026 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5027 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	5028 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	5029 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	5030 }
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	5031
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5032 /* 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	5033 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	5034 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	5035 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	5036 #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	5037
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5038 /* 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	5039 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	5040 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	5041 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	5042 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5043 /* 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	5044
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5045 /* 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	5046 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	5047 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	5048 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	5049 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	5050
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5051 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	5052 /* 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	5053 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	5054 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	5055 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	5056 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	5057 *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	5058 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5059 *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	5060 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5061
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5062 /* 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	5063 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	5064 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	5065 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	5066 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	5067 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	5068 continue;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5069 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	5070 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	5071 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	5072 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5073 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	5074 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5075
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5076 /* 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	5077 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	5078 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	5079 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	5080 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	5081 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	5082 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	5083 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	5084 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5085 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	5086 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	5087 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	5088 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	5089 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	5090 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	5091
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5092 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	5093 do {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5094 ++p;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5095 } 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	5096 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	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 do {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5099 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	5100 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	5101 continue;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5102 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	5103 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	5104 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	5105 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	5106 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	5107 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	5108 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	5109 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5110 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	5111 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	5112 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	5113 else
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5114 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	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 }
24685 36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5117 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	5118 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	5119 (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	5120 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	5121 {
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5122 /* 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	5123 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	5124 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	5125 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	5126 __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	5127 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	5128 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	5129 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	5130 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	5131 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	5132 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	5133 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	5134 /* 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	5135 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	5136 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	5137 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	5138 }
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5139 else {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5140 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	5141 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	5142 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5143 } 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	5144 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	5145 *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	5146 else
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5147 *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	5148 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	5149 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5150
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5151 /* 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	5152 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	5153 static int
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5154 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	5155 {
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5156 slotdef pp = (slotdef )data;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5157
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5158 for (; *pp; pp++)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5159 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	5160 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	5161 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5162
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5163 /* 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	5164 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	5165 static int
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5166 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	5167 {
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5168 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	5169 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	5170 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	5171 return c;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5172 else
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5173 /* Cannot use a-b, as this gives off_t,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5174 which may lose precision when converted to int. */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5175 return (a > b) ? 1 : (a < b) ? -1 : 0;
20423 4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5176 }
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5177
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5178 /* 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	5179 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	5180 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	5181 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	5182 {
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5183 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	5184 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	5185
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5186 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	5187 return;
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5188 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	5189 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	5190 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	5191 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	5192 }
20457 4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5193 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	5194 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	5195 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	5196 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5197
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5198 /* 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	5199 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	5200 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	5201 {
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5202 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	5203 slotdef *p;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5204 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	5205 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	5206
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5207 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	5208 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	5209 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	5210 /* 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	5211 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	5212 *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	5213 }
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5214 *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	5215 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	5216 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	5217 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	5218 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	5219 --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	5220 *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	5221 }
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5222 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	5223 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	5224 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	5225 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	5226 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5227
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5228 /* 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	5229 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	5230 dict. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5231 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	5232 fixup_slot_dispatchers(PyTypeObject *type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5233 {
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5234 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	5235
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5236 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	5237 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	5238 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	5239 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5240
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5241 static void
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5242 update_all_slots(PyTypeObject* type)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5243 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5244 slotdef *p;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5245
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5246 init_slotdefs();
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5247 for (p = slotdefs; p->name; p++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5248 /* update_slot returns int but can't actually fail */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5249 update_slot(type, p->name_strobj);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5250 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5251 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5252
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5253 /* 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	5254 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	5255 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	5256
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5257 static int
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5258 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	5259 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	5260 {
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5261 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	5262 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5263 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	5264 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5265
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5266 static int
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5267 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	5268 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	5269 {
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5270 PyTypeObject *subclass;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5271 PyObject ref, subclasses, *dict;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5272 Py_ssize_t i, n;
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5273
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5274 subclasses = type->tp_subclasses;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5275 if (subclasses == NULL)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5276 return 0;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5277 assert(PyList_Check(subclasses));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5278 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	5279 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	5280 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	5281 assert(PyWeakref_CheckRef(ref));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5282 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	5283 assert(subclass != NULL);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5284 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	5285 continue;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5286 assert(PyType_Check(subclass));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5287 /* 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	5288 dict = subclass->tp_dict;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5289 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	5290 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	5291 continue;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5292 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	5293 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5294 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5295 return 0;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5296 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5297
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5298 /* 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	5299 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	5300 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	5301 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	5302 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	5303 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	5304 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	5305 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	5306 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	5307
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5308 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	5309 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	5310 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	5311 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	5312 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	5313 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	5314 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	5315 wins.
23830 ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5316
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5317 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	5318 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	5319 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	5320 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	5321 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	5322 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	5323 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	5324 (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	5325 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	5326 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	5327
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5328 static int
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5329 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	5330 {
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5331 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	5332 slotdef *p;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5333 PyObject *descr;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5334 void **ptr;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5335
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5336 init_slotdefs();
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5337 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	5338 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	5339 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5340 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	5341 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	5342 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5343 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	5344 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5345 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	5346 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	5347 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5348 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	5349 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5350 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	5351 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5352 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	5353 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	5354 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5355 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5356 return 0;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5357 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5358
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5359
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5360 /* Cooperative 'super' */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5361
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5362 typedef struct {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5363 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	5364 PyTypeObject *type;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5365 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	5366 PyTypeObject *obj_type;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5367 } superobject;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5368
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5369 static PyMemberDef super_members[] = {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5370 {"__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	5371 "the class invoking super()"},
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	5372 {"__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	5373 "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	5374 {"__self_class__", T_OBJECT, offsetof(superobject, obj_type), READONLY,
30722 651fc8d98d99 Fix a bunch of typos in documentation, docstrings and comments. Walter Dörwald <walter@livinglogic.de> parents: 30683 diff changeset	5375 "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	5376 {0}
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5377 };
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5378
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5379 static void
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5380 super_dealloc(PyObject *self)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5381 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5382 superobject su = (superobject )self;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5383
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5384 _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	5385 Py_XDECREF(su->obj);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5386 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	5387 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	5388 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	5389 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5390
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5391 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	5392 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	5393 {
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5394 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	5395
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5396 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	5397 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	5398 "<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	5399 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	5400 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	5401 else
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5402 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	5403 "<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	5404 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	5405 }
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5406
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5407 static PyObject *
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5408 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	5409 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5410 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	5411 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	5412
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5413 if (!skip) {
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5414 /* 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	5415 (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	5416 skip = (PyString_Check(name) &&
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5417 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	5418 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	5419 }
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5420
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	5421 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	5422 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	5423 PyTypeObject *starttype;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5424 descrgetfunc f;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5425 Py_ssize_t i, n;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5426
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 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	5428 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	5429
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5430 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	5431 n = 0;
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5432 else {
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	5433 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	5434 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	5435 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5436 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	5437 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	5438 break;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5439 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5440 i++;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5441 res = NULL;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5442 for (; i < n; i++) {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5443 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	5444 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	5445 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	5446 else
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5447 continue;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	5448 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	5449 if (res != NULL) {
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5450 Py_INCREF(res);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5451 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	5452 if (f != NULL) {
31800 37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	5453 tmp = f(res,
37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	5454 /* Only pass 'obj' param if
37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	5455 this is instance-mode super
37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	5456 (See SF ID #743627)
37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	5457 */
31813 8184c677713f Get rid of gcc warning. Hye-Shik Chang <hyeshik@gmail.com> parents: 31800 diff changeset	5458 (su->obj == (PyObject *)
8184c677713f Get rid of gcc warning. Hye-Shik Chang <hyeshik@gmail.com> parents: 31800 diff changeset	5459 su->obj_type
31800 37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	5460 ? (PyObject *)NULL
37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	5461 : su->obj),
22774 02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	5462 (PyObject *)starttype);
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5463 Py_DECREF(res);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5464 res = tmp;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5465 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5466 return res;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5467 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5468 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5469 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5470 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	5471 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5472
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5473 static PyTypeObject *
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5474 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	5475 {
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5476 /* 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	5477
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5478 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	5479
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5480 - 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	5481 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	5482
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5483 - 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	5484 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	5485
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5486 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	5487 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	5488 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	5489 */
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5490
27942 9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5491 /* 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	5492 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	5493 Py_INCREF(obj);
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5494 return (PyTypeObject *)obj;
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5495 }
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5496
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5497 /* Normal case */
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	5498 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	5499 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	5500 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	5501 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5502 else {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5503 /* 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	5504 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	5505 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	5506
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5507 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	5508 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	5509 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	5510 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	5511 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5512
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5513 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	5514
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5515 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	5516 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	5517 (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	5518 {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5519 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	5520 (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	5521 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	5522 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	5523 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5524
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5525 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	5526 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	5527 else
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5528 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	5529 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	5530
27943 3b30f66362be Removed unreferenced label. Tim Peters <tim.peters@gmail.com> parents: 27942 diff changeset	5531 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	5532 "super(type, obj): "
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5533 "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	5534 return NULL;
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5535 }
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5536
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5537 static PyObject *
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5538 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	5539 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5540 superobject su = (superobject )self;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5541 superobject *newobj;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5542
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5543 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	5544 /* 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	5545 Py_INCREF(self);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5546 return self;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5547 }
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5548 if (su->ob_type != &PySuper_Type)
34958 c91e5e31c5ff Fixed a quite misleading comment: a "not" should not have been there. Armin Rigo <arigo@tunes.org> parents: 34668 diff changeset	5549 /* If su is an instance of a (strict) subclass of super,
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5550 call its type */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37881 diff changeset	5551 return PyObject_CallFunctionObjArgs((PyObject *)su->ob_type,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37881 diff changeset	5552 su->type, obj, NULL);
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5553 else {
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5554 /* 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	5555 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	5556 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	5557 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5558 newobj = (superobject *)PySuper_Type.tp_new(&PySuper_Type,
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5559 NULL, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5560 if (newobj == NULL)
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5561 return NULL;
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5562 Py_INCREF(su->type);
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5563 Py_INCREF(obj);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5564 newobj->type = su->type;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5565 newobj->obj = obj;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5566 newobj->obj_type = obj_type;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5567 return (PyObject *)newobj;
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	5568 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5569 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5570
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5571 static int
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5572 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	5573 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5574 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	5575 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	5576 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	5577 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	5578
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5579 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	5580 return -1;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5581 if (obj == Py_None)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5582 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	5583 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	5584 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	5585 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	5586 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	5587 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	5588 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5589 Py_INCREF(type);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5590 su->type = type;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5591 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	5592 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	5593 return 0;
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
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	5596 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	5597 "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	5598 "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	5599 "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	5600 "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	5601 "class C(B):\n"
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5602 " 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	5603 " 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	5604
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5605 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	5606 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	5607 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5608 superobject su = (superobject )self;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5609
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5610 Py_VISIT(su->obj);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5611 Py_VISIT(su->type);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	5612 Py_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	5613
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5614 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	5615 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	5616
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5617 PyTypeObject PySuper_Type = {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5618 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	5619 0, /* ob_size */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5620 "super", /* tp_name */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5621 sizeof(superobject), /* tp_basicsize */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5622 0, /* tp_itemsize */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5623 /* methods */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5624 super_dealloc, /* tp_dealloc */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5625 0, /* tp_print */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5626 0, /* tp_getattr */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5627 0, /* tp_setattr */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5628 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	5629 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	5630 0, /* tp_as_number */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5631 0, /* tp_as_sequence */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5632 0, /* tp_as_mapping */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5633 0, /* tp_hash */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5634 0, /* tp_call */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5635 0, /* tp_str */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5636 super_getattro, /* tp_getattro */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5637 0, /* tp_setattro */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5638 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	5639 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	5640 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	5641 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	5642 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	5643 0, /* tp_clear */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5644 0, /* tp_richcompare */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5645 0, /* tp_weaklistoffset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5646 0, /* tp_iter */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5647 0, /* tp_iternext */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5648 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	5649 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	5650 0, /* tp_getset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5651 0, /* tp_base */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5652 0, /* tp_dict */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5653 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	5654 0, /* tp_descr_set */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5655 0, /* tp_dictoffset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5656 super_init, /* tp_init */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5657 PyType_GenericAlloc, /* tp_alloc */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5658 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	5659 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	5660 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/typeobject.c @ 40382:d75b0caa67db