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

annotate Objects/typeobject.c @ 44685:e511ccf2ffbe legacy-trunk

Tighten the definition of a named tuple.

author	Raymond Hettinger <python@rcn.com>
date	Tue, 15 Jan 2008 03:07:42 +0000
parents	387d48c3a0b3
children	e224ad4b8b8c

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
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	8
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	9 /* Support type attribute cache */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	10
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	11 /* The cache can keep references to the names alive for longer than
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	12 they normally would. This is why the maximum size is limited to
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	13 MCACHE_MAX_ATTR_SIZE, since it might be a problem if very large
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	14 strings are used as attribute names. */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	15 #define MCACHE_MAX_ATTR_SIZE 100
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	16 #define MCACHE_SIZE_EXP 10
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	17 #define MCACHE_HASH(version, name_hash) \
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	18 (((unsigned int)(version) * (unsigned int)(name_hash)) \
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	19 >> (8*sizeof(unsigned int) - MCACHE_SIZE_EXP))
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	20 #define MCACHE_HASH_METHOD(type, name) \
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	21 MCACHE_HASH((type)->tp_version_tag, \
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	22 ((PyStringObject *)(name))->ob_shash)
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	23 #define MCACHE_CACHEABLE_NAME(name) \
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	24 PyString_CheckExact(name) && \
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	25 PyString_GET_SIZE(name) <= MCACHE_MAX_ATTR_SIZE
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	26
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	27 struct method_cache_entry {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	28 unsigned int version;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	29 PyObject name; / reference to exactly a str or None */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	30 PyObject value; / borrowed */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	31 };
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	32
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	33 static struct method_cache_entry method_cache[1 << MCACHE_SIZE_EXP];
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	34 static unsigned int next_version_tag = 0;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	35
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	36 static void
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	37 type_modified(PyTypeObject *type)
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	38 {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	39 /* Invalidate any cached data for the specified type and all
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	40 subclasses. This function is called after the base
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	41 classes, mro, or attributes of the type are altered.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	42
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	43 Invariants:
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	44
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	45 - Py_TPFLAGS_VALID_VERSION_TAG is never set if
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	46 Py_TPFLAGS_HAVE_VERSION_TAG is not set (e.g. on type
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	47 objects coming from non-recompiled extension modules)
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	48
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	49 - before Py_TPFLAGS_VALID_VERSION_TAG can be set on a type,
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	50 it must first be set on all super types.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	51
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	52 This function clears the Py_TPFLAGS_VALID_VERSION_TAG of a
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	53 type (so it must first clear it on all subclasses). The
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	54 tp_version_tag value is meaningless unless this flag is set.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	55 We don't assign new version tags eagerly, but only as
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	56 needed.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	57 */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	58 PyObject raw, ref;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	59 Py_ssize_t i, n;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	60
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	61 if(!PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG))
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	62 return;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	63
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	64 raw = type->tp_subclasses;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	65 if (raw != NULL) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	66 n = PyList_GET_SIZE(raw);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	67 for (i = 0; i < n; i++) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	68 ref = PyList_GET_ITEM(raw, i);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	69 ref = PyWeakref_GET_OBJECT(ref);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	70 if (ref != Py_None) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	71 type_modified((PyTypeObject *)ref);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	72 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	73 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	74 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	75 type->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	76 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	77
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	78 static void
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	79 type_mro_modified(PyTypeObject type, PyObject bases) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	80 /*
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	81 Check that all base classes or elements of the mro of type are
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	82 able to be cached. This function is called after the base
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	83 classes or mro of the type are altered.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	84
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	85 Unset HAVE_VERSION_TAG and VALID_VERSION_TAG if the type
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	86 inherits from an old-style class, either directly or if it
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	87 appears in the MRO of a new-style class. No support either for
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	88 custom MROs that include types that are not officially super
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	89 types.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	90
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	91 Called from mro_internal, which will subsequently be called on
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	92 each subclass when their mro is recursively updated.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	93 */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	94 Py_ssize_t i, n;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	95 int clear = 0;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	96
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	97 if(!PyType_HasFeature(type, Py_TPFLAGS_HAVE_VERSION_TAG))
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	98 return;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	99
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	100 n = PyTuple_GET_SIZE(bases);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	101 for (i = 0; i < n; i++) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	102 PyObject *b = PyTuple_GET_ITEM(bases, i);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	103 PyTypeObject *cls;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	104
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	105 if (!PyType_Check(b) ) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	106 clear = 1;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	107 break;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	108 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	109
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	110 cls = (PyTypeObject *)b;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	111
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	112 if (!PyType_HasFeature(cls, Py_TPFLAGS_HAVE_VERSION_TAG) \|\|
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	113 !PyType_IsSubtype(type, cls)) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	114 clear = 1;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	115 break;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	116 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	117 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	118
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	119 if (clear)
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	120 type->tp_flags &= ~(Py_TPFLAGS_HAVE_VERSION_TAG\|
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	121 Py_TPFLAGS_VALID_VERSION_TAG);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	122 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	123
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	124 static int
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	125 assign_version_tag(PyTypeObject *type)
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	126 {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	127 /* Ensure that the tp_version_tag is valid and set
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	128 Py_TPFLAGS_VALID_VERSION_TAG. To respect the invariant, this
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	129 must first be done on all super classes. Return 0 if this
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	130 cannot be done, 1 if Py_TPFLAGS_VALID_VERSION_TAG.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	131 */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	132 Py_ssize_t i, n;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	133 PyObject *bases;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	134
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	135 if (PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG))
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	136 return 1;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	137 if (!PyType_HasFeature(type, Py_TPFLAGS_HAVE_VERSION_TAG))
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	138 return 0;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	139 if (!PyType_HasFeature(type, Py_TPFLAGS_READY))
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	140 return 0;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	141
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	142 type->tp_version_tag = next_version_tag++;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	143 /* for stress-testing: next_version_tag &= 0xFF; */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	144
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	145 if (type->tp_version_tag == 0) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	146 /* wrap-around or just starting Python - clear the whole
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	147 cache by filling names with references to Py_None.
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	148 Values are also set to NULL for added protection, as they
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	149 are borrowed reference */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	150 for (i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	151 method_cache[i].value = NULL;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	152 Py_XDECREF(method_cache[i].name);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	153 method_cache[i].name = Py_None;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	154 Py_INCREF(Py_None);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	155 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	156 /* mark all version tags as invalid */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	157 type_modified(&PyBaseObject_Type);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	158 return 1;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	159 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	160 bases = type->tp_bases;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	161 n = PyTuple_GET_SIZE(bases);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	162 for (i = 0; i < n; i++) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	163 PyObject *b = PyTuple_GET_ITEM(bases, i);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	164 assert(PyType_Check(b));
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	165 if (!assign_version_tag((PyTypeObject *)b))
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	166 return 0;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	167 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	168 type->tp_flags \|= Py_TPFLAGS_VALID_VERSION_TAG;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	169 return 1;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	170 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	171
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	172
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	173 static PyMemberDef type_members[] = {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	174 {"__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	175 {"__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	176 {"__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	177 {"__weakrefoffset__", T_LONG,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	178 offsetof(PyTypeObject, tp_weaklistoffset), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	179 {"__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	180 {"__dictoffset__", T_LONG,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	181 offsetof(PyTypeObject, tp_dictoffset), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	182 {"__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	183 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	184 };
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	185
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	186 static PyObject *
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	187 type_name(PyTypeObject type, void context)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	188 {
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	189 const char *s;
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	190
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	191 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	192 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	193
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	194 Py_INCREF(et->ht_name);
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	195 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	196 }
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	197 else {
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	198 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	199 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	200 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	201 else
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	202 s++;
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	203 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	204 }
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	205 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	206
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	207 static int
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	208 type_set_name(PyTypeObject type, PyObject value, void *context)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	209 {
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	210 PyHeapTypeObject* et;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	211
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	212 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	213 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	214 "can't set %s.__name__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	215 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	216 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	217 if (!value) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	218 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	219 "can't delete %s.__name__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	220 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	221 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	222 if (!PyString_Check(value)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	223 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	224 "can only assign string to %s.__name__, not '%s'",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	225 type->tp_name, Py_TYPE(value)->tp_name);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	226 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	227 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	228 if (strlen(PyString_AS_STRING(value))
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	229 != (size_t)PyString_GET_SIZE(value)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	230 PyErr_Format(PyExc_ValueError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	231 "__name__ must not contain null bytes");
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	232 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	233 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	234
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	235 et = (PyHeapTypeObject*)type;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	236
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	237 Py_INCREF(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	238
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	239 Py_DECREF(et->ht_name);
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	240 et->ht_name = value;
26421 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 type->tp_name = PyString_AS_STRING(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	243
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	244 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	245 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	246
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	247 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	248 type_module(PyTypeObject type, void context)
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	249 {
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	250 PyObject *mod;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	251 char *s;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	252
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	253 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	254 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	255 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	256 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	257 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	258 }
26448 bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	259 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	260 return mod;
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	261 }
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	262 else {
bddc41315336 Nudge getting __module__ and __name__ for new-style classes so that Michael W. Hudson <mwh@python.net> parents: 26446 diff changeset	263 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	264 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	265 return PyString_FromStringAndSize(
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39921 diff changeset	266 type->tp_name, (Py_ssize_t)(s - type->tp_name));
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	267 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	268 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	269 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	270
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	271 static int
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	272 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	273 {
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	274 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	275 PyErr_Format(PyExc_TypeError,
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	276 "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	277 return -1;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	278 }
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	279 if (!value) {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	280 PyErr_Format(PyExc_TypeError,
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	281 "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	282 return -1;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	283 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	284
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	285 type_modified(type);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	286
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	287 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	288 }
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	289
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	290 static PyObject *
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	291 type_get_bases(PyTypeObject type, void context)
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 Py_INCREF(type->tp_bases);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	294 return type->tp_bases;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	295 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	296
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	297 static PyTypeObject best_base(PyObject );
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	298 static int mro_internal(PyTypeObject *);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	299 static int compatible_for_assignment(PyTypeObject , PyTypeObject , char *);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	300 static int add_subclass(PyTypeObject, PyTypeObject);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	301 static void remove_subclass(PyTypeObject , PyTypeObject );
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	302 static void update_all_slots(PyTypeObject *);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	303
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	304 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	305 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	306 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	307 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	308 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	309
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	310 static int
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	311 mro_subclasses(PyTypeObject type, PyObject temp)
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	312 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	313 PyTypeObject *subclass;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	314 PyObject ref, subclasses, *old_mro;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	315 Py_ssize_t i, n;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	316
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	317 subclasses = type->tp_subclasses;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	318 if (subclasses == NULL)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	319 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	320 assert(PyList_Check(subclasses));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	321 n = PyList_GET_SIZE(subclasses);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	322 for (i = 0; i < n; i++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	323 ref = PyList_GET_ITEM(subclasses, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	324 assert(PyWeakref_CheckRef(ref));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	325 subclass = (PyTypeObject *)PyWeakref_GET_OBJECT(ref);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	326 assert(subclass != NULL);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	327 if ((PyObject *)subclass == Py_None)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	328 continue;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	329 assert(PyType_Check(subclass));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	330 old_mro = subclass->tp_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	331 if (mro_internal(subclass) < 0) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	332 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	333 return -1;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	334 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	335 else {
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	336 PyObject* tuple;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	337 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	338 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	339 if (!tuple)
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	340 return -1;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	341 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	342 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	343 Py_DECREF(tuple);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	344 }
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	345 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	346 return -1;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	347 }
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	348 return 0;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	349 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	350
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	351 static int
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	352 type_set_bases(PyTypeObject type, PyObject value, void *context)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	353 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	354 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	355 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	356 PyObject ob, temp;
41488 5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	357 PyTypeObject new_base, old_base;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	358 PyObject old_bases, old_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	359
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	360 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	361 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	362 "can't set %s.__bases__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	363 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	364 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	365 if (!value) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	366 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	367 "can't delete %s.__bases__", type->tp_name);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	368 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	369 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	370 if (!PyTuple_Check(value)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	371 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	372 "can only assign tuple to %s.__bases__, not %s",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	373 type->tp_name, Py_TYPE(value)->tp_name);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	374 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	375 }
26645 d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	376 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	377 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	378 "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	379 type->tp_name);
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	380 return -1;
d176cbfd3765 Tighten the tests for assignment to __bases__: disallow empty tuple. Guido van Rossum <guido@python.org> parents: 26583 diff changeset	381 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	382 for (i = 0; i < PyTuple_GET_SIZE(value); i++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	383 ob = PyTuple_GET_ITEM(value, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	384 if (!PyClass_Check(ob) && !PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	385 PyErr_Format(
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	386 PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	387 "%s.__bases__ must be tuple of old- or new-style classes, not '%s'",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	388 type->tp_name, Py_TYPE(ob)->tp_name);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	389 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	390 }
26440 aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	391 if (PyType_Check(ob)) {
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	392 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	393 PyErr_SetString(PyExc_TypeError,
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	394 "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	395 return -1;
aa0e19b6e1e7 I had the inheritance cycle stuff backwards. Oops! Michael W. Hudson <mwh@python.net> parents: 26425 diff changeset	396 }
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	397 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	398 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	399
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	400 new_base = best_base(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	401
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	402 if (!new_base) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	403 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	404 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	405
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	406 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	407 return -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	408
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	409 Py_INCREF(new_base);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	410 Py_INCREF(value);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	411
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	412 old_bases = type->tp_bases;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	413 old_base = type->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	414 old_mro = type->tp_mro;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	415
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	416 type->tp_bases = value;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	417 type->tp_base = new_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	418
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	419 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	420 goto bail;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	421 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	422
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	423 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	424 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	425 goto bail;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	426
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	427 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	428
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	429 if (r < 0) {
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	430 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	431 PyTypeObject* cls;
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	432 PyObject* mro;
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	433 PyArg_UnpackTuple(PyList_GET_ITEM(temp, i),
3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	434 "", 2, 2, &cls, &mro);
41489 da403d2b886a Fix a usage of the dangerous pattern decref - modify field - incref. Armin Rigo <arigo@tunes.org> parents: 41488 diff changeset	435 Py_INCREF(mro);
da403d2b886a Fix a usage of the dangerous pattern decref - modify field - incref. Armin Rigo <arigo@tunes.org> parents: 41488 diff changeset	436 ob = cls->tp_mro;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	437 cls->tp_mro = mro;
41489 da403d2b886a Fix a usage of the dangerous pattern decref - modify field - incref. Armin Rigo <arigo@tunes.org> parents: 41488 diff changeset	438 Py_DECREF(ob);
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	439 }
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	440 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	441 goto bail;
26445 7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	442 }
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	443
7421367274b4 Readjustments to the way we cope with exceptions from subclasses' Michael W. Hudson <mwh@python.net> parents: 26440 diff changeset	444 Py_DECREF(temp);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	445
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	446 /* any base that was in __bases__ but now isn't, we
26660 f838bc9056cc Punctuation fix. Raymond Hettinger <python@rcn.com> parents: 26645 diff changeset	447 need to remove \|type\| from its tp_subclasses.
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	448 conversely, any class now in __bases__ that wasn't
26660 f838bc9056cc Punctuation fix. Raymond Hettinger <python@rcn.com> parents: 26645 diff changeset	449 needs to have \|type\| added to its subclasses. */
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	450
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	451 /* 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	452 add to all new_bases */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	453
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	454 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	455 ob = PyTuple_GET_ITEM(old_bases, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	456 if (PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	457 remove_subclass(
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	458 (PyTypeObject*)ob, type);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	459 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	460 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	461
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	462 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	463 ob = PyTuple_GET_ITEM(value, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	464 if (PyType_Check(ob)) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	465 if (add_subclass((PyTypeObject*)ob, type) < 0)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	466 r = -1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	467 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	468 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	469
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	470 update_all_slots(type);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	471
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	472 Py_DECREF(old_bases);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	473 Py_DECREF(old_base);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	474 Py_DECREF(old_mro);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	475
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	476 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	477
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	478 bail:
30084 d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	479 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	480 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	481 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	482 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	483 }
d05d0ed465d8 Repair refcounting on error return from type_set_bases. Michael W. Hudson <mwh@python.net> parents: 29900 diff changeset	484
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	485 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	486 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	487 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	488
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	489 return -1;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	490 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	491
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	492 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	493 type_dict(PyTypeObject type, void context)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	494 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	495 if (type->tp_dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	496 Py_INCREF(Py_None);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	497 return Py_None;
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	498 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	499 return PyDictProxy_New(type->tp_dict);
2080 c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	500 }
c21cc7b3ce28 added getattr(), supporting __doc__ and _name__ Guido van Rossum <guido@python.org> parents: 2059 diff changeset	501
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	502 static PyObject *
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	503 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	504 {
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	505 PyObject *result;
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	506 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	507 return PyString_FromString(type->tp_doc);
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	508 result = PyDict_GetItemString(type->tp_dict, "__doc__");
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	509 if (result == NULL) {
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	510 result = Py_None;
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	511 Py_INCREF(result);
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	512 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	513 else if (Py_TYPE(result)->tp_descr_get) {
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	514 result = Py_TYPE(result)->tp_descr_get(result, NULL,
23127 70650ae1a2cf type_get_doc(): Squash compiler wng about incompatible ptr types. Tim Peters <tim.peters@gmail.com> parents: 23118 diff changeset	515 (PyObject *)type);
23118 f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	516 }
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	517 else {
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	518 Py_INCREF(result);
f917e7a6e911 SF bug 542984. Guido van Rossum <guido@python.org> parents: 23037 diff changeset	519 }
22348 51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	520 return result;
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	521 }
51aa9eb24d81 SF patch 530070: pydoc regression, from Martin and Guido. Tim Peters <tim.peters@gmail.com> parents: 22331 diff changeset	522
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	523 static PyGetSetDef type_getsets[] = {
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	524 {"__name__", (getter)type_name, (setter)type_set_name, NULL},
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	525 {"__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	526 {"__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	527 {"__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	528 {"__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	529 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	530 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	531
18063 bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	532 static int
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	533 type_compare(PyObject v, PyObject w)
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	534 {
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	535 /* This is called with type objects only. So we
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	536 can just compare the addresses. */
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	537 Py_uintptr_t vv = (Py_uintptr_t)v;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	538 Py_uintptr_t ww = (Py_uintptr_t)w;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	539 return (vv < ww) ? -1 : (vv > ww) ? 1 : 0;
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	540 }
bbac2a6a5d16 Patch #424475: Speed-up tp_compare usage, by special-casing the common Martin v. Löwis <martin@v.loewis.de> parents: 14375 diff changeset	541
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	542 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	543 type_repr(PyTypeObject *type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	544 {
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	545 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	546 char *kind;
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	547
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	548 mod = type_module(type, NULL);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	549 if (mod == NULL)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	550 PyErr_Clear();
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	551 else if (!PyString_Check(mod)) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	552 Py_DECREF(mod);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	553 mod = NULL;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	554 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	555 name = type_name(type, NULL);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	556 if (name == NULL)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	557 return NULL;
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	558
20076 d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	559 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	560 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	561 else
d9250d5b79a7 Change repr() of a new-style class to say <class 'ClassName'> rather Guido van Rossum <guido@python.org> parents: 20075 diff changeset	562 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	563
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	564 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	565 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	566 kind,
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	567 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	568 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	569 }
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	570 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	571 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	572
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	573 Py_XDECREF(mod);
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	574 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	575 return rtn;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	576 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	577
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	578 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	579 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	580 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	581 PyObject *obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	582
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	583 if (type->tp_new == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	584 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	585 "cannot create '%.100s' instances",
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	586 type->tp_name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	587 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	588 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	589
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	590 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	591 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	592 /* 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	593 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	594 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	595 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	596 (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	597 (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	598 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	599 /* 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	600 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	601 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	602 return obj;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	603 type = obj->ob_type;
24250 804ea51cfce6 The object returned by tp_new() may not have a tp_init. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24245 diff changeset	604 if (PyType_HasFeature(type, Py_TPFLAGS_HAVE_CLASS) &&
804ea51cfce6 The object returned by tp_new() may not have a tp_init. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24245 diff changeset	605 type->tp_init != NULL &&
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	606 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	607 Py_DECREF(obj);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	608 obj = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	609 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	610 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	611 return obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	612 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	613
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	614 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	615 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	616 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	617 PyObject *obj;
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	618 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	619 /* 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	620
b285decf0421 Repaired the debug Windows deaths in test_descr, by allocating enough Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	621 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	622 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	623 else
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	624 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	625
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	626 if (obj == NULL)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	627 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	628
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	629 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	630
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	631 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	632 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	633
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	634 if (type->tp_itemsize == 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	635 PyObject_INIT(obj, type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	636 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	637 (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	638
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	639 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	640 _PyObject_GC_TRACK(obj);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	641 return obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	642 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	643
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	644 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	645 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	646 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	647 return type->tp_alloc(type, 0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	648 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	649
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	650 /* 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	651
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	652 static int
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	653 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	654 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	655 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	656 PyMemberDef *mp;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	657
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	658 n = Py_SIZE(type);
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	659 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	660 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	661 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	662 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	663 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	664 if (obj != NULL) {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	665 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	666 if (err)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	667 return err;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	668 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	669 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	670 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	671 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	672 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	673
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	674 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	675 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	676 {
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	677 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	678 traverseproc basetraverse;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	679
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	680 /* 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	681 and traverse slots while we're at it */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	682 type = Py_TYPE(self);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	683 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	684 while ((basetraverse = base->tp_traverse) == subtype_traverse) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	685 if (Py_SIZE(base)) {
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	686 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	687 if (err)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	688 return err;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	689 }
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	690 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	691 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	692 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	693
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	694 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	695 PyObject **dictptr = _PyObject_GetDictPtr(self);
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	696 if (dictptr && *dictptr)
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	697 Py_VISIT(*dictptr);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	698 }
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	699
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	700 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	701 /* For a heaptype, the instances count as references
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	702 to the type. Traverse the type so the collector
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	703 can find cycles involving this link. */
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	704 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	705
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	706 if (basetraverse)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	707 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	708 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	709 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	710
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	711 static void
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	712 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	713 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	714 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	715 PyMemberDef *mp;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	716
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	717 n = Py_SIZE(type);
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	718 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	719 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	720 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	721 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	722 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	723 if (obj != NULL) {
37748 d1547426ab61 Use Py_CLEAR instead of in-place DECREF/XDECREF or custom macros, for Thomas Wouters <thomas@python.org> parents: 37603 diff changeset	724 (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	725 Py_DECREF(obj);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	726 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	727 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	728 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	729 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	730
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	731 static int
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	732 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	733 {
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	734 PyTypeObject type, base;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	735 inquiry baseclear;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	736
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	737 /* 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	738 and clear slots while we're at it */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	739 type = Py_TYPE(self);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	740 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	741 while ((baseclear = base->tp_clear) == subtype_clear) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	742 if (Py_SIZE(base))
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	743 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	744 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	745 assert(base);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	746 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	747
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	748 /* 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	749 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	750
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	751 if (baseclear)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	752 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	753 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	754 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	755
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	756 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	757 subtype_dealloc(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	758 {
21246 cb921d483e00 The previous checkin to clear __slots__ variables did a little bit of Guido van Rossum <guido@python.org> parents: 21242 diff changeset	759 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	760 destructor basedealloc;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	761
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	762 /* Extract the type; we expect it to be a heap type */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	763 type = Py_TYPE(self);
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	764 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	765
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	766 /* 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	767
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	768 if (!PyType_IS_GC(type)) {
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	769 /* 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	770 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	771 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	772 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	773 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	774
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	775 /* 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	776 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	777 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	778 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	779 return;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	780 }
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	781
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	782 /* 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	783 base = type;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	784 while ((basedealloc = base->tp_dealloc) == subtype_dealloc) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	785 assert(Py_SIZE(base) == 0);
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	786 base = base->tp_base;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	787 assert(base);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	788 }
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	789
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	790 /* Call the base tp_dealloc() */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	791 assert(basedealloc);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	792 basedealloc(self);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	793
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	794 /* 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	795 Py_DECREF(type);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	796
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	797 /* Done */
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	798 return;
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	799 }
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	800
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	801 /* 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	802
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	803 /* UnTrack and re-Track around the trashcan macro, alas */
27717 41313d20d1dd Comment typo fix Andrew M. Kuchling <amk@amk.ca> parents: 27707 diff changeset	804 /* 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	805 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	806 ++_PyTrash_delete_nesting;
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	807 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	808 --_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	809 /* 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	810 * (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	811 * 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	812 * 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	813 */
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	814
29442 6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	815 /* 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	816 base = type;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	817 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	818 base = base->tp_base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	819 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	820 }
cb921d483e00 The previous checkin to clear __slots__ variables did a little bit of Guido van Rossum <guido@python.org> parents: 21242 diff changeset	821
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	822 /* 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	823 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	824 dict. */
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	825
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	826 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	827 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	828
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	829 /* 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	830 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	831 _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	832 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	833 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	834 goto endlabel; /* resurrected */
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	835 else
8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	836 _PyObject_GC_UNTRACK(self);
40707 dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	837 /* New weakrefs could be created during the finalizer call.
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	838 If this occurs, clear them out without calling their
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	839 finalizers since they might rely on part of the object
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	840 being finalized that has already been destroyed. */
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	841 if (type->tp_weaklistoffset && !base->tp_weaklistoffset) {
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	842 /* Modeled after GET_WEAKREFS_LISTPTR() */
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	843 PyWeakReference list = (PyWeakReference ) \
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	844 PyObject_GET_WEAKREFS_LISTPTR(self);
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	845 while (*list)
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	846 _PyWeakref_ClearRef(*list);
dbbdfc038dc9 Fix crasher for when an object's __del__ creates a new weakref to itself. Brett Cannon <bcannon@gmail.com> parents: 40066 diff changeset	847 }
29308 ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	848 }
ad1e67ac567b Fix for SF 742911. We now clear the weakrefs before calling __del__ Guido van Rossum <guido@python.org> parents: 29201 diff changeset	849
29442 6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	850 /* 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	851 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	852 while ((basedealloc = base->tp_dealloc) == subtype_dealloc) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	853 if (Py_SIZE(base))
29442 6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	854 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	855 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	856 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	857 }
6fecc99afa69 - SF patch 751998 fixes an unwanted side effect of the previous fix Guido van Rossum <guido@python.org> parents: 29408 diff changeset	858
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	859 /* 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	860 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	861 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	862 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	863 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	864 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	865 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	866 *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	867 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	868 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	869 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	870
30917 12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	871 /* 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	872 * basedealloc knows about gc.
12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	873 */
12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	874 if (PyType_IS_GC(base))
12c22d6b1ec0 subtype_dealloc(): Simplified overly contorted retracking logic. With Tim Peters <tim.peters@gmail.com> parents: 30915 diff changeset	875 _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	876 assert(basedealloc);
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	877 basedealloc(self);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	878
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	879 /* 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	880 Py_DECREF(type);
40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	881
24653 1ab27c1770df Fix a subtle bug in the trashcan code I added yesterday to Guido van Rossum <guido@python.org> parents: 24614 diff changeset	882 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	883 ++_PyTrash_delete_nesting;
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	884 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	885 --_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	886
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	887 /* 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	888
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	889 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	890
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	891 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	892 For one, this explains why there must be a call to GC-untrack
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	893 before the trashcan begin macro. Without understanding the
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	894 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	895 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	896
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	897 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	898 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	899
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	900 A. In the case that the base class is GC-aware, the base class
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	901 probably GC-untracks the object. If it does that using the
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	902 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	903 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	904 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	905 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	906 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	907 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	908
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	909 GC untrack
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	910 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	911 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	912
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	913 Q. Why did the last question say "immediately GC-track again"?
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	914 It's nowhere near immediately.
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	915
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	916 A. Because the code used to re-track immediately. Bad Idea.
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	917 self has a refcount of 0, and if gc ever gets its hands on it
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	918 (which can happen if any weakref callback gets invoked), it
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	919 looks like trash to gc too, and gc also tries to delete self
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	920 then. But we're already deleting self. Double dealloction is
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	921 a subtle disaster.
30915 8081643c373f subtype_dealloc(): A more complete fix for critical bug 840829 + Tim Peters <tim.peters@gmail.com> parents: 30907 diff changeset	922
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	923 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	924 _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	925
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	926 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	927 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	928
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	929 - 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	930
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	931 - 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	932
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	933 - the trashcan limit is not yet reached, so the trashcan level
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	934 is incremented and the code between trashcan begin and end is
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	935 executed
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	936
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	937 - this destroys much of the object's contents, including its
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	938 slots and __dict__
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	939
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	940 - basedealloc() is called; this is really list_dealloc(), or
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	941 some other type which also uses the trashcan macros
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	942
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	943 - the trashcan limit is now reached, so the object is put on the
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	944 trashcan's to-be-deleted-later list
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	945
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	946 - 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	947
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	948 - 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	949
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	950 - 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	951
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	952 - later, the trashcan code starts deleting the objects from its
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	953 to-be-deleted-later list
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	954
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	955 - 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	956
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	957 - at the very least (if the destroyed slots and __dict__ don't
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	958 cause problems) the object's type gets decref'ed a second
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	959 time, which is BAD!!!
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	960
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	961 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	962 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	963 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	964 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	965 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	966 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	967
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	968 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	969 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	970 the trashcan mechanism completely: the decremented level means
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	971 that the effective level never reaches the limit. Therefore, we
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	972 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	973 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	974 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	975
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	976 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	977 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	978
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	979 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	980 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	981 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	982 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	983 */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	984 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	985
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	986 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	987
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	988 /* type test with subclassing support */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	989
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	990 int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	991 PyType_IsSubtype(PyTypeObject a, PyTypeObject b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	992 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	993 PyObject *mro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	994
19803 32cfce4d83dc PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing Guido van Rossum <guido@python.org> parents: 19630 diff changeset	995 if (!(a->tp_flags & Py_TPFLAGS_HAVE_CLASS))
32cfce4d83dc PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing Guido van Rossum <guido@python.org> parents: 19630 diff changeset	996 return b == a \|\| b == &PyBaseObject_Type;
32cfce4d83dc PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing Guido van Rossum <guido@python.org> parents: 19630 diff changeset	997
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	998 mro = a->tp_mro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	999 if (mro != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1000 /* Deal with multiple inheritance without recursion
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1001 by walking the MRO tuple */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1002 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1003 assert(PyTuple_Check(mro));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1004 n = PyTuple_GET_SIZE(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1005 for (i = 0; i < n; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1006 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	1007 return 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1008 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1009 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1010 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1011 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1012 /* 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	1013 do {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1014 if (a == b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1015 return 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1016 a = a->tp_base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1017 } while (a != NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1018 return b == &PyBaseObject_Type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1019 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1020 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1021
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1022 /* 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	1023 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	1024 (so we can't use PyObject_GetAttr) but still binding
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	1025 it to the instance. The arguments are the object,
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	1026 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	1027 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	1028
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1029 Two variants:
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1030
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1031 - 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	1032 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	1033
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1034 - 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	1035 */
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	1036
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	1037 static PyObject *
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1038 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	1039 {
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	1040 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	1041
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	1042 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	1043 *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	1044 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	1045 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	1046 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1047 res = _PyType_Lookup(Py_TYPE(self), *attrobj);
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1048 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	1049 descrgetfunc f;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1050 if ((f = Py_TYPE(res)->tp_descr_get) == 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	1051 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	1052 else
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1053 res = f(res, self, (PyObject *)(Py_TYPE(self)));
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	1054 }
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	1055 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	1056 }
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	1057
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1058 static PyObject *
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1059 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	1060 {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1061 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	1062 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	1063 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	1064 return res;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1065 }
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1066
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1067 /* A variation of PyObject_CallMethod that uses lookup_method()
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	1068 instead of PyObject_GetAttrString(). This uses the same convention
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1069 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	1070
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	1071 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	1072 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	1073 {
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1074 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	1075 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	1076 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	1077
20225 aa18c0ecc4fb call_method(), call_maybe(): fix a performance bug: the argument Guido van Rossum <guido@python.org> parents: 20220 diff changeset	1078 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	1079 if (func == NULL) {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1080 va_end(va);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1081 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	1082 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	1083 return NULL;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1084 }
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1085
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1086 if (format && *format)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1087 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	1088 else
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1089 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	1090
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1091 va_end(va);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1092
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1093 if (args == NULL)
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1094 return NULL;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1095
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1096 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	1097 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	1098
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1099 Py_DECREF(args);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1100 Py_DECREF(func);
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1101
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1102 return retval;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1103 }
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1104
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1105 /* 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	1106
20595 c4d9d8674506 Add missing "static" declarations (found by "make smelly"). Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 20586 diff changeset	1107 static PyObject *
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1108 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	1109 {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1110 va_list va;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1111 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	1112 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	1113
20225 aa18c0ecc4fb call_method(), call_maybe(): fix a performance bug: the argument Guido van Rossum <guido@python.org> parents: 20220 diff changeset	1114 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	1115 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	1116 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	1117 if (!PyErr_Occurred()) {
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1118 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	1119 return Py_NotImplemented;
ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	1120 }
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	1121 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	1122 }
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1123
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1124 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	1125 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	1126 else
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1127 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	1128
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1129 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	1130
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	1131 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	1132 return NULL;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1133
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	1134 assert(PyTuple_Check(args));
cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	1135 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	1136
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1137 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	1138 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	1139
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1140 return retval;
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1141 }
b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	1142
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1143 static int
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1144 fill_classic_mro(PyObject mro, PyObject cls)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1145 {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1146 PyObject bases, base;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1147 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	1148
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1149 assert(PyList_Check(mro));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1150 assert(PyClass_Check(cls));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1151 i = PySequence_Contains(mro, cls);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1152 if (i < 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1153 return -1;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1154 if (!i) {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1155 if (PyList_Append(mro, cls) < 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1156 return -1;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1157 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1158 bases = ((PyClassObject *)cls)->cl_bases;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1159 assert(bases && PyTuple_Check(bases));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1160 n = PyTuple_GET_SIZE(bases);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1161 for (i = 0; i < n; i++) {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1162 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	1163 if (fill_classic_mro(mro, base) < 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1164 return -1;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1165 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1166 return 0;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1167 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1168
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1169 static PyObject *
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1170 classic_mro(PyObject *cls)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1171 {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1172 PyObject *mro;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1173
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1174 assert(PyClass_Check(cls));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1175 mro = PyList_New(0);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1176 if (mro != NULL) {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1177 if (fill_classic_mro(mro, cls) == 0)
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1178 return mro;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1179 Py_DECREF(mro);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1180 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1181 return NULL;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1182 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1183
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1184 /*
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 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	1186 "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	1187 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	1188 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	1189 (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	1190
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1191 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	1192
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1193 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	1194 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	1195
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1196 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	1197
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1198 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	1199 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	1200 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	1201
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1202 Monotonicity.
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1203 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	1204 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	1205
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1206 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	1207 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	1208 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	1209 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	1210 */
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1211
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1212 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	1213 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	1214 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	1215 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	1216
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1217 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	1218 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	1219 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	1220 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1221 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	1222 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1223
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1224 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	1225 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	1226 {
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1227 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	1228 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	1229 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	1230 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	1231 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	1232 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1233 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	1234 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	1235 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	1236 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	1237 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	1238 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1239 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	1240 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1241
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1242 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	1243 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	1244 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1245 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	1246 /* 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	1247 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	1248 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1249 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	1250 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	1251 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	1252 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	1253 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	1254 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	1255 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	1256 "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	1257 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	1258 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	1259 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	1260 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1261 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1262 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1263 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	1264 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1265
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1266 /* 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	1267
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1268 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	1269 insight into error reporting, report the classes that were candidates
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	1270 to be put next into the MRO. There is some conflict between the
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1271 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	1272 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	1273 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1274
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1275 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	1276 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	1277 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1278 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	1279 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	1280 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	1281 PyObject *set = PyDict_New();
37067 1f4549865aad Fix some missing checks after PyTuple_New, PyList_New, PyDict_New Georg Brandl <georg@python.org> parents: 36925 diff changeset	1282 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	1283
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1284 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	1285 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	1286 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	1287 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	1288 PyObject *c = PyList_GET_ITEM(L, remain[i]);
37067 1f4549865aad Fix some missing checks after PyTuple_New, PyList_New, PyDict_New Georg Brandl <georg@python.org> parents: 36925 diff changeset	1289 if (PyDict_SetItem(set, c, Py_None) < 0) {
1f4549865aad Fix some missing checks after PyTuple_New, PyList_New, PyDict_New Georg Brandl <georg@python.org> parents: 36925 diff changeset	1290 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	1291 return;
37067 1f4549865aad Fix some missing checks after PyTuple_New, PyList_New, PyDict_New Georg Brandl <georg@python.org> parents: 36925 diff changeset	1292 }
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1293 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1294 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1295 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	1296
28514 9400504cb0b2 SF bug #699934: Obscure error message Raymond Hettinger <python@rcn.com> parents: 28403 diff changeset	1297 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	1298 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	1299 i = 0;
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37759 diff changeset	1300 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	1301 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	1302 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	1303 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	1304 Py_XDECREF(name);
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37759 diff changeset	1305 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	1306 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	1307 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	1308 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1309 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1310 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	1311 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	1312 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1313
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1314 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	1315 pmerge(PyObject acc, PyObject to_merge) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1316 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	1317 int *remain;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1318 int ok;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1319
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1320 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	1321
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1322 /* 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	1323 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	1324 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	1325 */
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	1326 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	1327 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	1328 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	1329 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	1330 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	1331
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1332 again:
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1333 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	1334 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	1335 PyObject *candidate;
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	1336
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1337 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	1338
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1339 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	1340 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	1341 continue;
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	1342 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1343
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1344 /* 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	1345
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1346 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	1347 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	1348 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	1349 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1350
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1351 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	1352 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	1353 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	1354 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	1355 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	1356 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1357 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1358 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	1359 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	1360 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	1361 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	1362 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1363 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	1364 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	1365 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	1366 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	1367 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	1368 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1369 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1370 goto again;
26227 529719a5350e Repaired illegal syntax most compilers probably let slide (but MSVC Tim Peters <tim.peters@gmail.com> parents: 26222 diff changeset	1371 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	1372 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1373
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1374 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	1375 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	1376 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	1377 }
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1378 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	1379 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	1380 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	1381 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1382
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1383 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1384 mro_implementation(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1385 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1386 Py_ssize_t i, n;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1387 int ok;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1388 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	1389 PyObject to_merge, bases_aslist;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1390
23903 066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1391 if(type->tp_dict == NULL) {
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1392 if(PyType_Ready(type) < 0)
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1393 return NULL;
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1394 }
066f8938071a Patch from SF bug 570483 (Tim Northover). Guido van Rossum <guido@python.org> parents: 23856 diff changeset	1395
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1396 /* 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	1397 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	1398 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	1399
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1400 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	1401 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	1402 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	1403 */
26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1404
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1405 bases = type->tp_bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1406 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	1407
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1408 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	1409 if (to_merge == NULL)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1410 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	1411
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1412 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	1413 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	1414 PyObject *parentMRO;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1415 if (PyType_Check(base))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1416 parentMRO = PySequence_List(
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1417 ((PyTypeObject*)base)->tp_mro);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1418 else
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1419 parentMRO = classic_mro(base);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1420 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	1421 Py_DECREF(to_merge);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1422 return NULL;
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	1423 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1424
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1425 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	1426 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1427
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1428 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	1429 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	1430 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	1431 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1432 }
26410 26918e2efd17 A tweaked version of Jeremy's patch #642489, to produce better error Guido van Rossum <guido@python.org> parents: 26227 diff changeset	1433 /* 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	1434 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	1435 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	1436 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	1437 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	1438 }
26222 c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1439 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	1440
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1441 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	1442 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	1443 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	1444 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	1445 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1446
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1447 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	1448 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	1449 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	1450 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	1451 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	1452 }
c95190532c0c Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch Guido van Rossum <guido@python.org> parents: 25853 diff changeset	1453
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1454 return result;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1455 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1456
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1457 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	1458 mro_external(PyObject *self)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1459 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1460 PyTypeObject type = (PyTypeObject )self;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1461
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1462 return mro_implementation(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1463 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1464
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1465 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1466 mro_internal(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1467 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1468 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	1469 int checkit = 0;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1470
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1471 if (Py_TYPE(type) == &PyType_Type) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1472 result = mro_implementation(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1473 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1474 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	1475 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	1476 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	1477 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	1478 if (mro == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1479 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1480 result = PyObject_CallObject(mro, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1481 Py_DECREF(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1482 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1483 if (result == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1484 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1485 tuple = PySequence_Tuple(result);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1486 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	1487 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	1488 return -1;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1489 if (checkit) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1490 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	1491 PyObject *cls;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1492 PyTypeObject *solid;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1493
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1494 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	1495
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1496 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	1497
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1498 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	1499 PyTypeObject *t;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1500 cls = PyTuple_GET_ITEM(tuple, i);
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1501 if (PyClass_Check(cls))
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1502 continue;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1503 else if (!PyType_Check(cls)) {
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1504 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	1505 "mro() returned a non-class ('%.500s')",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1506 Py_TYPE(cls)->tp_name);
36169 652429c4f2a4 Fix ref/memory leak introduced in rev 41845. Neal Norwitz <nnorwitz@gmail.com> parents: 36153 diff changeset	1507 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	1508 return -1;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1509 }
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1510 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	1511 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	1512 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	1513 "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	1514 t->tp_name);
36169 652429c4f2a4 Fix ref/memory leak introduced in rev 41845. Neal Norwitz <nnorwitz@gmail.com> parents: 36153 diff changeset	1515 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	1516 return -1;
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1517 }
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1518 }
042eb3d1ce3f SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro". Armin Rigo <arigo@tunes.org> parents: 36150 diff changeset	1519 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1520 type->tp_mro = tuple;
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1521
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1522 type_mro_modified(type, type->tp_mro);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1523 /* corner case: the old-style super class might have been hidden
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1524 from the custom MRO */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1525 type_mro_modified(type, type->tp_bases);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1526
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1527 type_modified(type);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	1528
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1529 return 0;
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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1532
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1533 /* Calculate the best base amongst multiple base classes.
41488 5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1534 This is the first one that's on the path to the "solid base". */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1535
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1536 static PyTypeObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1537 best_base(PyObject *bases)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1538 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1539 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1540 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	1541 PyObject *base_proto;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1542
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1543 assert(PyTuple_Check(bases));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1544 n = PyTuple_GET_SIZE(bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1545 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	1546 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	1547 winner = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1548 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	1549 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	1550 if (PyClass_Check(base_proto))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1551 continue;
41488 5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1552 if (!PyType_Check(base_proto)) {
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1553 PyErr_SetString(
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1554 PyExc_TypeError,
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1555 "bases must be types");
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1556 return NULL;
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1557 }
20978 44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1558 base_i = (PyTypeObject *)base_proto;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1559 if (base_i->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	1560 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	1561 return NULL;
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 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	1564 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	1565 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	1566 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	1567 }
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	1568 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	1569 ;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1570 else if (PyType_IsSubtype(candidate, winner)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1571 winner = candidate;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1572 base = base_i;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1573 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1574 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1575 PyErr_SetString(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1576 PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1577 "multiple bases have "
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1578 "instance lay-out conflict");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1579 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1580 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1581 }
21404 064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1582 if (base == NULL)
064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1583 PyErr_SetString(PyExc_TypeError,
064311149cb4 (Merge into trunk.) Guido van Rossum <guido@python.org> parents: 21246 diff changeset	1584 "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	1585 return base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1586 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1587
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1588 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1589 extra_ivars(PyTypeObject type, PyTypeObject base)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1590 {
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	1591 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	1592 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	1593
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1594 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	1595 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	1596 /* If itemsize is involved, stricter rules */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1597 return t_size != b_size \|\|
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1598 type->tp_itemsize != base->tp_itemsize;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1599 }
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1600 if (type->tp_weaklistoffset && base->tp_weaklistoffset == 0 &&
41576 980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1601 type->tp_weaklistoffset + sizeof(PyObject *) == t_size &&
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1602 type->tp_flags & Py_TPFLAGS_HEAPTYPE)
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1603 t_size -= sizeof(PyObject *);
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1604 if (type->tp_dictoffset && base->tp_dictoffset == 0 &&
41576 980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1605 type->tp_dictoffset + sizeof(PyObject *) == t_size &&
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1606 type->tp_flags & Py_TPFLAGS_HEAPTYPE)
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1607 t_size -= sizeof(PyObject *);
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1608
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1609 return t_size != b_size;
18933 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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1612 static PyTypeObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1613 solid_base(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1614 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1615 PyTypeObject *base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1616
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1617 if (type->tp_base)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1618 base = solid_base(type->tp_base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1619 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1620 base = &PyBaseObject_Type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1621 if (extra_ivars(type, base))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1622 return type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1623 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1624 return base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1625 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1626
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1627 static void object_dealloc(PyObject *);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1628 static int object_init(PyObject , PyObject , PyObject *);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1629 static int update_slot(PyTypeObject , PyObject );
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	1630 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	1631
41576 980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1632 /*
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1633 * Helpers for __dict__ descriptor. We don't want to expose the dicts
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1634 * inherited from various builtin types. The builtin base usually provides
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1635 * its own __dict__ descriptor, so we use that when we can.
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1636 */
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1637 static PyTypeObject *
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1638 get_builtin_base_with_dict(PyTypeObject *type)
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1639 {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1640 while (type->tp_base != NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1641 if (type->tp_dictoffset != 0 &&
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1642 !(type->tp_flags & Py_TPFLAGS_HEAPTYPE))
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1643 return type;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1644 type = type->tp_base;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1645 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1646 return NULL;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1647 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1648
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1649 static PyObject *
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1650 get_dict_descriptor(PyTypeObject *type)
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1651 {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1652 static PyObject *dict_str;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1653 PyObject *descr;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1654
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1655 if (dict_str == NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1656 dict_str = PyString_InternFromString("__dict__");
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1657 if (dict_str == NULL)
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1658 return NULL;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1659 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1660 descr = _PyType_Lookup(type, dict_str);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1661 if (descr == NULL \|\| !PyDescr_IsData(descr))
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1662 return NULL;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1663
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1664 return descr;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1665 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1666
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1667 static void
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1668 raise_dict_descr_error(PyObject *obj)
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1669 {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1670 PyErr_Format(PyExc_TypeError,
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1671 "this __dict__ descriptor does not support "
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1672 "'%.200s' objects", obj->ob_type->tp_name);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1673 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1674
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1675 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	1676 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	1677 {
41576 980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1678 PyObject **dictptr;
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	1679 PyObject *dict;
41576 980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1680 PyTypeObject *base;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1681
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1682 base = get_builtin_base_with_dict(obj->ob_type);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1683 if (base != NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1684 descrgetfunc func;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1685 PyObject *descr = get_dict_descriptor(base);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1686 if (descr == NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1687 raise_dict_descr_error(obj);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1688 return NULL;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1689 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1690 func = descr->ob_type->tp_descr_get;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1691 if (func == NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1692 raise_dict_descr_error(obj);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1693 return NULL;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1694 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1695 return func(descr, obj, (PyObject *)(obj->ob_type));
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1696 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1697
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1698 dictptr = _PyObject_GetDictPtr(obj);
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	1699 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	1700 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	1701 "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	1702 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	1703 }
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1704 dict = *dictptr;
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1705 if (dict == NULL)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1706 *dictptr = dict = PyDict_New();
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1707 Py_XINCREF(dict);
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	1708 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	1709 }
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1710
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1711 static int
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1712 subtype_setdict(PyObject obj, PyObject value, void *context)
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1713 {
41576 980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1714 PyObject **dictptr;
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1715 PyObject *dict;
41576 980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1716 PyTypeObject *base;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1717
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1718 base = get_builtin_base_with_dict(obj->ob_type);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1719 if (base != NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1720 descrsetfunc func;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1721 PyObject *descr = get_dict_descriptor(base);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1722 if (descr == NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1723 raise_dict_descr_error(obj);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1724 return -1;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1725 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1726 func = descr->ob_type->tp_descr_set;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1727 if (func == NULL) {
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1728 raise_dict_descr_error(obj);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1729 return -1;
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1730 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1731 return func(descr, obj, value);
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1732 }
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1733
980ff0b1b957 Fix for #1303614 and #1174712: Armin Rigo <arigo@tunes.org> parents: 41489 diff changeset	1734 dictptr = _PyObject_GetDictPtr(obj);
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1735 if (dictptr == NULL) {
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1736 PyErr_SetString(PyExc_AttributeError,
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1737 "This object has no __dict__");
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1738 return -1;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1739 }
21235 b782490da7f0 At the PythonLabs meeting someone mentioned it would make Jim really Guido van Rossum <guido@python.org> parents: 21192 diff changeset	1740 if (value != NULL && !PyDict_Check(value)) {
38871 a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	1741 PyErr_Format(PyExc_TypeError,
a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	1742 "__dict__ must be set to a dictionary, "
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1743 "not a '%.200s'", Py_TYPE(value)->tp_name);
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1744 return -1;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1745 }
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1746 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	1747 Py_XINCREF(value);
20681 a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1748 *dictptr = value;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1749 Py_XDECREF(dict);
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1750 return 0;
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1751 }
a0f1c2d2ac9e Allow assignment to newinstance.__dict__. Guido van Rossum <guido@python.org> parents: 20599 diff changeset	1752
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1753 static PyObject *
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1754 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	1755 {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1756 PyObject **weaklistptr;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1757 PyObject *result;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1758
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1759 if (Py_TYPE(obj)->tp_weaklistoffset == 0) {
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1760 PyErr_SetString(PyExc_AttributeError,
39367 55f830183532 SF patch #1534048 (bug #1531003): fix typo in error message Fred Drake <fdrake@acm.org> parents: 39129 diff changeset	1761 "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	1762 return NULL;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1763 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1764 assert(Py_TYPE(obj)->tp_weaklistoffset > 0);
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1765 assert(Py_TYPE(obj)->tp_weaklistoffset + sizeof(PyObject *) <=
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1766 (size_t)(Py_TYPE(obj)->tp_basicsize));
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1767 weaklistptr = (PyObject **)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1768 ((char *)obj + Py_TYPE(obj)->tp_weaklistoffset);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1769 if (*weaklistptr == NULL)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1770 result = Py_None;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1771 else
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1772 result = *weaklistptr;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1773 Py_INCREF(result);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1774 return result;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1775 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	1776
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	1777 /* 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	1778
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1779 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	1780 {"__dict__", subtype_dict, subtype_setdict,
24785 4de9ac0e4173 Allow docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24762 diff changeset	1781 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	1782 {"__weakref__", subtype_getweakref, NULL,
24785 4de9ac0e4173 Allow docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24762 diff changeset	1783 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	1784 {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	1785 };
337b53679c73 Pytype_GenericAlloc(): round up size so we zap all four bytes of the Guido van Rossum <guido@python.org> parents: 19595 diff changeset	1786
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	1787 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	1788 {"__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	1789 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	1790 {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	1791 };
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1792
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1793 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	1794 {"__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	1795 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	1796 {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	1797 };
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	1798
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1799 static int
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1800 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	1801 {
24245 50443127b21d valid_identifier(): use an unsigned char* so that isalpha() will do Guido van Rossum <guido@python.org> parents: 24184 diff changeset	1802 unsigned char *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1803 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	1804
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1805 if (!PyString_Check(s)) {
38871 a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	1806 PyErr_Format(PyExc_TypeError,
a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	1807 "__slots__ items must be strings, not '%.200s'",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1808 Py_TYPE(s)->tp_name);
23666 2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1809 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1810 }
24245 50443127b21d valid_identifier(): use an unsigned char* so that isalpha() will do Guido van Rossum <guido@python.org> parents: 24184 diff changeset	1811 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	1812 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	1813 /* 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	1814 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	1815 if (n == 0)
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1816 n = 1;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1817 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	1818 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	1819 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	1820 "__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	1821 return 0;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1822 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1823 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1824 return 1;
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1825 }
2becb5793acd Address SF bug 519621: slots weren't traversed by GC. Guido van Rossum <guido@python.org> parents: 23649 diff changeset	1826
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1827 #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	1828 /* 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	1829
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1830 static PyObject *
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	1831 _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	1832 {
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1833 PyObject *tmp = NULL;
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1834 PyObject slot_name, new_name;
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	1835 Py_ssize_t i;
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1836
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1837 for (i = 0; i < nslots; i++) {
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1838 if (PyUnicode_Check(slot_name = PyTuple_GET_ITEM(slots, i))) {
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1839 if (tmp == NULL) {
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1840 tmp = PySequence_List(slots);
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1841 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	1842 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	1843 }
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1844 new_name = _PyUnicode_AsDefaultEncodedString(slot_name,
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1845 NULL);
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1846 if (new_name == NULL) {
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1847 Py_DECREF(tmp);
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1848 return NULL;
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1849 }
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1850 Py_INCREF(new_name);
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1851 PyList_SET_ITEM(tmp, i, new_name);
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1852 Py_DECREF(slot_name);
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1853 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1854 }
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1855 if (tmp != NULL) {
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1856 slots = PyList_AsTuple(tmp);
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1857 Py_DECREF(tmp);
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1858 }
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	1859 return slots;
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1860 }
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1861 #endif
a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	1862
41287 12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1863 /* Forward */
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1864 static int
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1865 object_init(PyObject self, PyObject args, PyObject *kwds);
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1866
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1867 static int
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1868 type_init(PyObject cls, PyObject args, PyObject *kwds)
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1869 {
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1870 int res;
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1871
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1872 assert(args != NULL && PyTuple_Check(args));
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1873 assert(kwds == NULL \|\| PyDict_Check(kwds));
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1874
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1875 if (kwds != NULL && PyDict_Check(kwds) && PyDict_Size(kwds) != 0) {
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1876 PyErr_SetString(PyExc_TypeError,
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1877 "type.__init__() takes no keyword arguments");
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1878 return -1;
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1879 }
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1880
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1881 if (args != NULL && PyTuple_Check(args) &&
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1882 (PyTuple_GET_SIZE(args) != 1 && PyTuple_GET_SIZE(args) != 3)) {
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1883 PyErr_SetString(PyExc_TypeError,
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1884 "type.__init__() takes 1 or 3 arguments");
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1885 return -1;
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1886 }
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1887
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1888 /* Call object.__init__(self) now. */
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1889 /* XXX Could call super(type, cls).__init__() but what's the point? */
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1890 args = PyTuple_GetSlice(args, 0, 0);
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1891 res = object_init(cls, args, NULL);
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1892 Py_DECREF(args);
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1893 return res;
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1894 }
12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	1895
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	1896 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1897 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	1898 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1899 PyObject name, bases, *dict;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36631 diff changeset	1900 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	1901 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	1902 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	1903 PyHeapTypeObject *et;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	1904 PyMemberDef *mp;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1905 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	1906 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	1907
20725 7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1908 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	1909 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	1910
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	1911 /* 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	1912 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	1913 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	1914 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	1915
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1916 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	1917 PyObject *x = PyTuple_GET_ITEM(args, 0);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1918 Py_INCREF(Py_TYPE(x));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	1919 return (PyObject *) Py_TYPE(x);
20725 7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1920 }
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1921
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1922 /* 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	1923 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	1924 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	1925 if (nargs + nkwds != 3) {
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1926 PyErr_SetString(PyExc_TypeError,
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1927 "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	1928 return NULL;
7130750a6222 SF bug #475327: type() produces incorrect error msg Tim Peters <tim.peters@gmail.com> parents: 20681 diff changeset	1929 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1930 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1931
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	1932 /* Check arguments: (name, bases, dict) */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1933 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	1934 &name,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1935 &PyTuple_Type, &bases,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1936 &PyDict_Type, &dict))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1937 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1938
41488 5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1939 /* Determine the proper metatype to deal with this,
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1940 and check for metatype conflicts while we're at it.
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1941 Note that if some other metatype wins to contract,
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1942 it's possible that its instances are not types. */
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1943 nbases = PyTuple_GET_SIZE(bases);
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1944 winner = metatype;
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1945 for (i = 0; i < nbases; i++) {
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1946 tmp = PyTuple_GET_ITEM(bases, i);
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1947 tmptype = tmp->ob_type;
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1948 if (tmptype == &PyClass_Type)
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1949 continue; /* Special case classic classes */
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1950 if (PyType_IsSubtype(winner, tmptype))
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1951 continue;
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1952 if (PyType_IsSubtype(tmptype, winner)) {
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1953 winner = tmptype;
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1954 continue;
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1955 }
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1956 PyErr_SetString(PyExc_TypeError,
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1957 "metaclass conflict: "
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1958 "the metaclass of a derived class "
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1959 "must be a (non-strict) subclass "
5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1960 "of the metaclasses of all its bases");
40975 d62805a993c5 Add checking for a number of metaclass error conditions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40974 diff changeset	1961 return NULL;
41488 5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1962 }
40975 d62805a993c5 Add checking for a number of metaclass error conditions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40974 diff changeset	1963 if (winner != metatype) {
41488 5a6d903ab7b5 Revert r53997 as per Armin Rigo <arigo@tunes.org> parents: 41463 diff changeset	1964 if (winner->tp_new != type_new) /* Pass it to the winner */
40975 d62805a993c5 Add checking for a number of metaclass error conditions. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40974 diff changeset	1965 return winner->tp_new(winner, args, kwds);
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	1966 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	1967 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1968
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1969 /* Adjust for empty tuple bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1970 if (nbases == 0) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	1971 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	1972 if (bases == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1973 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1974 nbases = 1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1975 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1976 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1977 Py_INCREF(bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1978
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1979 /* 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	1980
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1981 /* 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	1982 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	1983 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	1984 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1985 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	1986 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1987 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	1988 PyErr_Format(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1989 "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	1990 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	1991 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1992 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1993 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1994
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1995 /* 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	1996 slots = PyDict_GetItemString(dict, "__slots__");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	1997 nslots = 0;
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1998 add_dict = 0;
9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	1999 add_weak = 0;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2000 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	2001 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	2002 if (slots == NULL) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2003 if (may_add_dict) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2004 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2005 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2006 if (may_add_weak) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2007 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2008 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2009 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2010 else {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2011 /* Have slots */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2012
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2013 /* Make it into a tuple */
41463 5f8a87fb4df3 When __slots__ are set to a unicode string, make it work the same as Neal Norwitz <nnorwitz@gmail.com> parents: 41287 diff changeset	2014 if (PyString_Check(slots) \|\| PyUnicode_Check(slots))
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	2015 slots = PyTuple_Pack(1, slots);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2016 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2017 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	2018 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	2019 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2020 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	2021 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2022 assert(PyTuple_Check(slots));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2023
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2024 /* Are slots allowed? */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2025 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	2026 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	2027 PyErr_Format(PyExc_TypeError,
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	2028 "nonempty __slots__ "
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	2029 "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	2030 base->tp_name);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2031 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	2032 Py_DECREF(bases);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2033 Py_DECREF(slots);
19595 db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	2034 return NULL;
db36e396f043 Safety measures now that str and tuple are subclassable: Guido van Rossum <guido@python.org> parents: 19594 diff changeset	2035 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2036
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	2037 #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	2038 tmp = _unicode_to_string(slots, nslots);
41188 2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	2039 if (tmp == NULL)
2900ec04031d Patch #1680015: Don't modify __slots__ tuple if it contains an unicode Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41110 diff changeset	2040 goto bad_slots;
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	2041 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	2042 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	2043 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	2044 }
25792 a3d612f0563f Allow Unicode strings in __slots__, converting them to byte strings. Martin v. Löwis <martin@v.loewis.de> parents: 24867 diff changeset	2045 #endif
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2046 /* 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	2047 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	2048 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	2049 char *s;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2050 if (!valid_identifier(tmp))
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2051 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2052 assert(PyString_Check(tmp));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2053 s = PyString_AS_STRING(tmp);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2054 if (strcmp(s, "__dict__") == 0) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2055 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	2056 PyErr_SetString(PyExc_TypeError,
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2057 "__dict__ slot disallowed: "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2058 "we already got one");
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2059 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2060 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2061 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2062 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2063 if (strcmp(s, "__weakref__") == 0) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2064 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	2065 PyErr_SetString(PyExc_TypeError,
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2066 "__weakref__ slot disallowed: "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2067 "either we already got one, "
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2068 "or __itemsize__ != 0");
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2069 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2070 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2071 add_weak++;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2072 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2073 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	2074
41212 c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2075 /* Copy slots into a list, mangle names and sort them.
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2076 Sorted names are needed for __class__ assignment.
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2077 Convert them back to tuple at the end.
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2078 */
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2079 newslots = PyList_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	2080 if (newslots == NULL)
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2081 goto bad_slots;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2082 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	2083 char *s;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	2084 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	2085 s = PyString_AS_STRING(tmp);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2086 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	2087 (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	2088 continue;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35637 diff changeset	2089 tmp =_Py_Mangle(name, tmp);
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2090 if (!tmp)
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2091 goto bad_slots;
41212 c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2092 PyList_SET_ITEM(newslots, j, tmp);
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2093 j++;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	2094 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2095 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	2096 nslots = j;
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	2097 Py_DECREF(slots);
41212 c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2098 if (PyList_Sort(newslots) == -1) {
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2099 Py_DECREF(bases);
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2100 Py_DECREF(newslots);
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2101 return NULL;
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2102 }
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2103 slots = PyList_AsTuple(newslots);
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2104 Py_DECREF(newslots);
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2105 if (slots == NULL) {
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2106 Py_DECREF(bases);
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2107 return NULL;
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2108 }
23950 f7ce696979e1 SF 569257 -- Name mangle double underscored variable names in __slots__. Raymond Hettinger <python@rcn.com> parents: 23903 diff changeset	2109
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2110 /* 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	2111 if (nbases > 1 &&
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2112 ((may_add_dict && !add_dict) \|\|
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2113 (may_add_weak && !add_weak))) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2114 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	2115 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	2116 if (tmp == (PyObject *)base)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2117 continue; /* Skip primary base */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2118 if (PyClass_Check(tmp)) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2119 /* Classic base class provides both */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2120 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	2121 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2122 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	2123 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2124 break;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2125 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2126 assert(PyType_Check(tmp));
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2127 tmptype = (PyTypeObject *)tmp;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2128 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	2129 tmptype->tp_dictoffset != 0)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2130 add_dict++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2131 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	2132 tmptype->tp_weaklistoffset != 0)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2133 add_weak++;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2134 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	2135 continue;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2136 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	2137 continue;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2138 /* Nothing more to check */
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2139 break;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2140 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2141 }
19349 9b5a2c1a02f3 Weak reference support, closing SF bug #451773. Guido van Rossum <guido@python.org> parents: 19339 diff changeset	2142 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2143
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2144 /* 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	2145 "return NULL" may leak slots! */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2146
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2147 /* Allocate the type object */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2148 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	2149 if (type == NULL) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2150 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	2151 Py_DECREF(bases);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2152 return NULL;
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2153 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2154
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2155 /* 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	2156 et = (PyHeapTypeObject *)type;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2157 Py_INCREF(name);
36631 49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	2158 et->ht_name = name;
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	2159 et->ht_slots = slots;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2160
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2161 /* Initialize tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2162 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	2163 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	2164 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	2165 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	2166
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2167 /* It's a new-style number unless it specifically inherits any
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2168 old-style numeric behavior */
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2169 if ((base->tp_flags & Py_TPFLAGS_CHECKTYPES) \|\|
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2170 (base->tp_as_number == NULL))
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2171 type->tp_flags \|= Py_TPFLAGS_CHECKTYPES;
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2172
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	2173 /* Initialize essential fields */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2174 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	2175 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	2176 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	2177 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	2178 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	2179
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2180 /* Set tp_base and tp_bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2181 type->tp_bases = bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2182 Py_INCREF(base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2183 type->tp_base = base;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2184
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2185 /* 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	2186 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	2187 if (dict == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2188 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2189 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2190 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2191
19300 81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2192 /* Set __module__ in the dict */
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2193 if (PyDict_GetItemString(dict, "__module__") == NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2194 tmp = PyEval_GetGlobals();
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2195 if (tmp != NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2196 tmp = PyDict_GetItemString(tmp, "__name__");
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2197 if (tmp != NULL) {
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2198 if (PyDict_SetItemString(dict, "__module__",
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2199 tmp) < 0)
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2200 return NULL;
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2201 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2202 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2203 }
81440dd326bb Fix SF bug #442501: calculate __module__ properly. Guido van Rossum <guido@python.org> parents: 19297 diff changeset	2204
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2205 /* 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	2206 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	2207 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	2208 */
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2209 {
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2210 PyObject *doc = PyDict_GetItemString(dict, "__doc__");
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2211 if (doc != NULL && PyString_Check(doc)) {
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2212 const size_t n = (size_t)PyString_GET_SIZE(doc);
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2213 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	2214 if (tp_doc == NULL) {
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2215 Py_DECREF(type);
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2216 return NULL;
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2217 }
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	2218 memcpy(tp_doc, PyString_AS_STRING(doc), n+1);
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2219 type->tp_doc = tp_doc;
20239 2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2220 }
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2221 }
2745c3dc24af SF bug [#467331] ClassType.__doc__ always None. Tim Peters <tim.peters@gmail.com> parents: 20231 diff changeset	2222
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2223 /* 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	2224 make it a static function */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2225 tmp = PyDict_GetItemString(dict, "__new__");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2226 if (tmp != NULL && PyFunction_Check(tmp)) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2227 tmp = PyStaticMethod_New(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2228 if (tmp == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2229 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2230 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2231 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2232 PyDict_SetItemString(dict, "__new__", tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2233 Py_DECREF(tmp);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2234 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2235
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2236 /* 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	2237 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	2238 slotoffset = base->tp_basicsize;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2239 if (slots != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2240 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	2241 mp->name = PyString_AS_STRING(
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2242 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	2243 mp->type = T_OBJECT_EX;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2244 mp->offset = slotoffset;
41110 a8ae2c29c66a Patch #1675981: remove unreachable code from type.__new__() method. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 40975 diff changeset	2245
a8ae2c29c66a Patch #1675981: remove unreachable code from type.__new__() method. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 40975 diff changeset	2246 /* __dict__ and __weakref__ are already filtered out */
a8ae2c29c66a Patch #1675981: remove unreachable code from type.__new__() method. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 40975 diff changeset	2247 assert(strcmp(mp->name, "__dict__") != 0);
a8ae2c29c66a Patch #1675981: remove unreachable code from type.__new__() method. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 40975 diff changeset	2248 assert(strcmp(mp->name, "__weakref__") != 0);
a8ae2c29c66a Patch #1675981: remove unreachable code from type.__new__() method. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 40975 diff changeset	2249
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2250 slotoffset += sizeof(PyObject *);
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 }
24761 e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2253 if (add_dict) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2254 if (base->tp_itemsize)
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2255 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	2256 else
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2257 type->tp_dictoffset = slotoffset;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2258 slotoffset += sizeof(PyObject *);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2259 }
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2260 if (add_weak) {
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2261 assert(!base->tp_itemsize);
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2262 type->tp_weaklistoffset = slotoffset;
e0431d9c4474 Refactor how __dict__ and __weakref__ interact with __slots__. Guido van Rossum <guido@python.org> parents: 24728 diff changeset	2263 slotoffset += sizeof(PyObject *);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2264 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2265 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	2266 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	2267 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	2268
22d660494f29 Fix for SF bug #642358: only provide a new with a __dict__ or Guido van Rossum <guido@python.org> parents: 27124 diff changeset	2269 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	2270 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	2271 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	2272 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	2273 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	2274 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	2275 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	2276 type->tp_getset = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2277
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2278 /* Special case some slots */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2279 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	2280 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	2281 type->tp_getattro = PyObject_GenericGetAttr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2282 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	2283 type->tp_setattro = PyObject_GenericSetAttr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2284 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2285 type->tp_dealloc = subtype_dealloc;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2286
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20259 diff changeset	2287 /* 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	2288 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	2289 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	2290 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	2291
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2292 /* 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	2293 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	2294 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	2295 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	2296 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	2297 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	2298 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2299 else
22980 9f949027d7ba Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22871 diff changeset	2300 type->tp_free = PyObject_Del;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2301
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2302 /* Initialize the rest */
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	2303 if (PyType_Ready(type) < 0) {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2304 Py_DECREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2305 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2306 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2307
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	2308 /* 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	2309 fixup_slot_dispatchers(type);
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	2310
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2311 return (PyObject *)type;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2312 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2313
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2314 /* 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	2315 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	2316 PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2317 _PyType_Lookup(PyTypeObject type, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2318 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	2319 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	2320 PyObject mro, res, base, dict;
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2321 unsigned int h;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2322
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2323 if (MCACHE_CACHEABLE_NAME(name) &&
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2324 PyType_HasFeature(type,Py_TPFLAGS_VALID_VERSION_TAG)) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2325 /* fast path */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2326 h = MCACHE_HASH_METHOD(type, name);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2327 if (method_cache[h].version == type->tp_version_tag &&
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2328 method_cache[h].name == name)
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2329 return method_cache[h].value;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2330 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2331
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	2332 /* 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	2333 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	2334
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	2335 /* 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	2336 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	2337 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	2338 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	2339 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	2340
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2341 res = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2342 assert(PyTuple_Check(mro));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2343 n = PyTuple_GET_SIZE(mro);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2344 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	2345 base = PyTuple_GET_ITEM(mro, i);
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	2346 if (PyClass_Check(base))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	2347 dict = ((PyClassObject *)base)->cl_dict;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	2348 else {
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	2349 assert(PyType_Check(base));
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	2350 dict = ((PyTypeObject *)base)->tp_dict;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	2351 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2352 assert(dict && PyDict_Check(dict));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2353 res = PyDict_GetItem(dict, name);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2354 if (res != NULL)
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2355 break;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2356 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2357
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2358 if (MCACHE_CACHEABLE_NAME(name) && assign_version_tag(type)) {
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2359 h = MCACHE_HASH_METHOD(type, name);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2360 method_cache[h].version = type->tp_version_tag;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2361 method_cache[h].value = res; /* borrowed */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2362 Py_INCREF(name);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2363 Py_DECREF(method_cache[h].name);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2364 method_cache[h].name = name;
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2365 }
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	2366 return res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2367 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2368
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2369 /* This is similar to PyObject_GenericGetAttr(),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2370 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	2371 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2372 type_getattro(PyTypeObject type, PyObject name)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2373 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2374 PyTypeObject *metatype = Py_TYPE(type);
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2375 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	2376 descrgetfunc meta_get;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2377
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2378 /* 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	2379 if (type->tp_dict == NULL) {
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	2380 if (PyType_Ready(type) < 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2381 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2382 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2383
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2384 /* 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	2385 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	2386
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2387 /* 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	2388 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	2389
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2390 if (meta_attribute != NULL) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2391 meta_get = Py_TYPE(meta_attribute)->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	2392
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2393 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	2394 /* 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	2395 * 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	2396 * 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	2397 */
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2398 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	2399 (PyObject *)metatype);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2400 }
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2401 Py_INCREF(meta_attribute);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2402 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2403
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2404 /* 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	2405 * 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	2406 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	2407 if (attribute != NULL) {
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2408 /* Implement descriptor functionality, if any */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2409 descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get;
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2410
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2411 Py_XDECREF(meta_attribute);
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2412
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2413 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	2414 /* 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	2415 * 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	2416 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	2417 (PyObject *)type);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2418 }
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23967 diff changeset	2419
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2420 Py_INCREF(attribute);
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2421 return attribute;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2422 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2423
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2424 /* 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	2425 * descriptor from the metatype, if any */
30159 941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2426 if (meta_get != NULL) {
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2427 PyObject *res;
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2428 res = meta_get(meta_attribute, (PyObject *)type,
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2429 (PyObject *)metatype);
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2430 Py_DECREF(meta_attribute);
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2431 return res;
941d49a65f06 Fix for Michael W. Hudson <mwh@python.net> parents: 30098 diff changeset	2432 }
22804 77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2433
77343aa03e2f Clarifying code rearrangement and comments by David Abrahams. I've Guido van Rossum <guido@python.org> parents: 22774 diff changeset	2434 /* 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	2435 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	2436 return meta_attribute;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2437 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2438
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2439 /* Give up */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2440 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	2441 "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	2442 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	2443 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2444 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2445
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2446 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2447 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	2448 {
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2449 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	2450 PyErr_Format(
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2451 PyExc_TypeError,
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2452 "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	2453 type->tp_name);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2454 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	2455 }
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2456 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	2457 return -1;
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	2458 return update_slot(type, name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2459 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2460
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2461 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2462 type_dealloc(PyTypeObject *type)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2463 {
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2464 PyHeapTypeObject *et;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2465
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2466 /* 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	2467 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	2468 _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	2469 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	2470 et = (PyHeapTypeObject *)type;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2471 Py_XDECREF(type->tp_base);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2472 Py_XDECREF(type->tp_dict);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2473 Py_XDECREF(type->tp_bases);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2474 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	2475 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	2476 Py_XDECREF(type->tp_subclasses);
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2477 /* A type's tp_doc is heap allocated, unlike the tp_doc slots
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2478 * of most other objects. It's okay to cast it to char *.
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2479 */
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35742 diff changeset	2480 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	2481 Py_XDECREF(et->ht_name);
49d9c120357a Bug #1086854: Rename PyHeapType members adding ht_ prefix. Georg Brandl <georg@python.org> parents: 36519 diff changeset	2482 Py_XDECREF(et->ht_slots);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2483 Py_TYPE(type)->tp_free((PyObject *)type);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2484 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2485
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2486 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	2487 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	2488 {
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2489 PyObject list, raw, *ref;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	2490 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	2491
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2492 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	2493 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	2494 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	2495 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	2496 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	2497 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	2498 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	2499 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	2500 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	2501 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	2502 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	2503 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	2504 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	2505 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	2506 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	2507 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	2508 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2509 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2510 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2511 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	2512 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	2513
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2514 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	2515 {"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	2516 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	2517 {"__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	2518 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	2519 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2520 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2521
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	2522 PyDoc_STRVAR(type_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2523 "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	2524 "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	2525
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2526 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	2527 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	2528 {
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2529 /* 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	2530 for heaptypes. */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2531 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	2532
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	2533 Py_VISIT(type->tp_dict);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	2534 Py_VISIT(type->tp_cache);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	2535 Py_VISIT(type->tp_mro);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	2536 Py_VISIT(type->tp_bases);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	2537 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	2538
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2539 /* 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	2540 ((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	2541 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	2542 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	2543
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2544 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	2545 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2546
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2547 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	2548 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	2549 {
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2550 /* 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	2551 for heaptypes. */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2552 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	2553
23755 0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2554 /* 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	2555 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	2556 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	2557 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	2558 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	2559
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2560 tp_dict:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2561 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	2562
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2563 tp_cache:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2564 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	2565
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2566 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	2567 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	2568 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	2569 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	2570
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2571 tp_subclasses:
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2572 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	2573 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	2574
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	2575 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	2576 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	2577 */
0279040ae03c In the recent python-dev thread "Bizarre new test failure", we Guido van Rossum <guido@python.org> parents: 23753 diff changeset	2578
37748 d1547426ab61 Use Py_CLEAR instead of in-place DECREF/XDECREF or custom macros, for Thomas Wouters <thomas@python.org> parents: 37603 diff changeset	2579 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	2580
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2581 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	2582 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2583
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2584 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	2585 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	2586 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2587 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	2588 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	2589
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2590 PyTypeObject PyType_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41816 diff changeset	2591 PyVarObject_HEAD_INIT(&PyType_Type, 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2592 "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	2593 sizeof(PyHeapTypeObject), /* tp_basicsize */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	2594 sizeof(PyMemberDef), /* tp_itemsize */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2595 (destructor)type_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2596 0, /* tp_print */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2597 0, /* tp_getattr */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2598 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2599 type_compare, /* tp_compare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2600 (reprfunc)type_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2601 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2602 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2603 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2604 (hashfunc)_Py_HashPointer, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2605 (ternaryfunc)type_call, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2606 0, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2607 (getattrofunc)type_getattro, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2608 (setattrofunc)type_setattro, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2609 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	2610 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
40908 d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	2611 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_TYPE_SUBCLASS, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2612 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	2613 (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	2614 (inquiry)type_clear, /* tp_clear */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2615 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	2616 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	2617 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2618 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2619 type_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2620 type_members, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2621 type_getsets, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2622 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2623 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2624 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2625 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2626 offsetof(PyTypeObject, tp_dict), /* tp_dictoffset */
41287 12c70558074e Add a type.__init__() method that enforces the same signature as Guido van Rossum <guido@python.org> parents: 41281 diff changeset	2627 type_init, /* tp_init */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2628 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2629 type_new, /* tp_new */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	2630 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	2631 (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	2632 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2633
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2634
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2635 /* 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	2636
41281 8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2637 /* You may wonder why object.__new__() only complains about arguments
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2638 when object.__init__() is not overridden, and vice versa.
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2639
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2640 Consider the use cases:
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2641
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2642 1. When neither is overridden, we want to hear complaints about
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2643 excess (i.e., any) arguments, since their presence could
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2644 indicate there's a bug.
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2645
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2646 2. When defining an Immutable type, we are likely to override only
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2647 __new__(), since __init__() is called too late to initialize an
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2648 Immutable object. Since __new__() defines the signature for the
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2649 type, it would be a pain to have to override __init__() just to
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2650 stop it from complaining about excess arguments.
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2651
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2652 3. When defining a Mutable type, we are likely to override only
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2653 __init__(). So here the converse reasoning applies: we don't
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2654 want to have to override __new__() just to stop it from
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2655 complaining.
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2656
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2657 4. When __init__() is overridden, and the subclass __init__() calls
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2658 object.__init__(), the latter should complain about excess
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2659 arguments; ditto for __new__().
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2660
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2661 Use cases 2 and 3 make it unattractive to unconditionally check for
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2662 excess arguments. The best solution that addresses all four use
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2663 cases is as follows: __init__() complains about excess arguments
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2664 unless __new__() is overridden and __init__() is not overridden
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2665 (IOW, if __init__() is overridden or __new__() is not overridden);
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2666 symmetrically, __new__() complains about excess arguments unless
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2667 __init__() is overridden and __new__() is not overridden
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2668 (IOW, if __new__() is overridden or __init__() is not overridden).
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2669
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2670 However, for backwards compatibility, this breaks too much code.
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2671 Therefore, in 2.6, we'll warn about excess arguments when both
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2672 methods are overridden; for all other cases we'll use the above
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2673 rules.
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2674
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2675 */
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2676
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2677 /* Forward */
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2678 static PyObject *
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2679 object_new(PyTypeObject type, PyObject args, PyObject *kwds);
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2680
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2681 static int
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2682 excess_args(PyObject args, PyObject kwds)
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2683 {
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2684 return PyTuple_GET_SIZE(args) \|\|
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2685 (kwds && PyDict_Check(kwds) && PyDict_Size(kwds));
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2686 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2687
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2688 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2689 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	2690 {
41281 8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2691 int err = 0;
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2692 if (excess_args(args, kwds)) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2693 PyTypeObject *type = Py_TYPE(self);
41281 8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2694 if (type->tp_init != object_init &&
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2695 type->tp_new != object_new)
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2696 {
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2697 err = PyErr_WarnEx(PyExc_DeprecationWarning,
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2698 "object.__init__() takes no parameters",
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2699 1);
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2700 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2701 else if (type->tp_init != object_init \|\|
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2702 type->tp_new == object_new)
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2703 {
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2704 PyErr_SetString(PyExc_TypeError,
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2705 "object.__init__() takes no parameters");
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2706 err = -1;
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2707 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2708 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2709 return err;
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2710 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2711
27866 bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2712 static PyObject *
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2713 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	2714 {
41281 8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2715 int err = 0;
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2716 if (excess_args(args, kwds)) {
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2717 if (type->tp_new != object_new &&
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2718 type->tp_init != object_init)
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2719 {
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2720 err = PyErr_WarnEx(PyExc_DeprecationWarning,
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2721 "object.__new__() takes no parameters",
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2722 1);
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2723 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2724 else if (type->tp_new != object_new \|\|
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2725 type->tp_init == object_init)
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2726 {
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2727 PyErr_SetString(PyExc_TypeError,
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2728 "object.__new__() takes no parameters");
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2729 err = -1;
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2730 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2731 }
8debce2c4fb1 - Bug #1683368: The object.__init__() and object.__new__() methods are Guido van Rossum <guido@python.org> parents: 41212 diff changeset	2732 if (err < 0)
27866 bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2733 return NULL;
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2734 return type->tp_alloc(type, 0);
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2735 }
bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	2736
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2737 static void
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2738 object_dealloc(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2739 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2740 Py_TYPE(self)->tp_free(self);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2741 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2742
19194 7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2743 static PyObject *
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2744 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	2745 {
19316 f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2746 PyTypeObject *type;
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	2747 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	2748
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2749 type = Py_TYPE(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	2750 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	2751 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	2752 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	2753 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	2754 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	2755 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	2756 }
f7dc21cb1661 Fix object_repr() to include the module (using the same rules as Guido van Rossum <guido@python.org> parents: 19301 diff changeset	2757 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	2758 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	2759 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	2760 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	2761 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	2762 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	2763 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	2764 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	2765 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	2766 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	2767 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	2768 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	2769 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	2770 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	2771 }
7e9f5c59e9f2 Make dynamic types work as intended. Or at least more so. Guido van Rossum <guido@python.org> parents: 19192 diff changeset	2772
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2773 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2774 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	2775 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2776 unaryfunc f;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2777
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2778 f = Py_TYPE(self)->tp_repr;
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2779 if (f == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2780 f = object_repr;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2781 return f(self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2782 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	2783
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2784 static PyObject *
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2785 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	2786 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2787 Py_INCREF(Py_TYPE(self));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2788 return (PyObject *)(Py_TYPE(self));
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2789 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2790
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2791 static int
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2792 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	2793 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2794 return a == b \|\|
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2795 (a != NULL &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2796 b != NULL &&
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2797 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	2798 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	2799 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	2800 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	2801 ((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	2802 (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	2803 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2804
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2805 static int
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2806 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	2807 {
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2808 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	2809 Py_ssize_t size;
41212 c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2810 PyObject slots_a, slots_b;
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2811
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2812 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	2813 return 0;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2814 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	2815 return 1;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2816 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	2817 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	2818 size += sizeof(PyObject *);
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2819 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	2820 size += sizeof(PyObject *);
41212 c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2821
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2822 /* Check slots compliance */
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2823 slots_a = ((PyHeapTypeObject *)a)->ht_slots;
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2824 slots_b = ((PyHeapTypeObject *)b)->ht_slots;
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2825 if (slots_a && slots_b) {
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2826 if (PyObject_Compare(slots_a, slots_b) != 0)
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2827 return 0;
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2828 size += sizeof(PyObject ) PyTuple_GET_SIZE(slots_a);
c57cd546612d Patch #1623563: allow __class__ assignment for classes with __slots__. Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41201 diff changeset	2829 }
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2830 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	2831 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2832
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2833 static int
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2834 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	2835 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2836 PyTypeObject newbase, oldbase;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2837
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2838 if (newto->tp_dealloc != oldto->tp_dealloc \|\|
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2839 newto->tp_free != oldto->tp_free)
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2840 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2841 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2842 "%s assignment: "
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2843 "'%s' deallocator differs from '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2844 attr,
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2845 newto->tp_name,
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2846 oldto->tp_name);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2847 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2848 }
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2849 newbase = newto;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2850 oldbase = oldto;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2851 while (equiv_structs(newbase, newbase->tp_base))
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2852 newbase = newbase->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2853 while (equiv_structs(oldbase, oldbase->tp_base))
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2854 oldbase = oldbase->tp_base;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2855 if (newbase != oldbase &&
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2856 (newbase->tp_base != oldbase->tp_base \|\|
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2857 !same_slots_added(newbase, oldbase))) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2858 PyErr_Format(PyExc_TypeError,
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2859 "%s assignment: "
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2860 "'%s' object layout differs from '%s'",
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2861 attr,
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2862 newto->tp_name,
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2863 oldto->tp_name);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2864 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2865 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	2866
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2867 return 1;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2868 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2869
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2870 static int
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2871 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	2872 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2873 PyTypeObject *oldto = Py_TYPE(self);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2874 PyTypeObject *newto;
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2875
23037 89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2876 if (value == NULL) {
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2877 PyErr_SetString(PyExc_TypeError,
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2878 "can't delete __class__ attribute");
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2879 return -1;
89db9e3f35a7 SF bug #541883 (Vincent Fiack). Guido van Rossum <guido@python.org> parents: 22980 diff changeset	2880 }
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2881 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	2882 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	2883 "__class__ must be set to new-style class, not '%s' object",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2884 Py_TYPE(value)->tp_name);
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2885 return -1;
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2886 }
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2887 newto = (PyTypeObject *)value;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2888 if (!(newto->tp_flags & Py_TPFLAGS_HEAPTYPE) \|\|
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2889 !(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	2890 {
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2891 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	2892 "__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	2893 return -1;
3b8a707b41c4 Disallow class assignment completely unless both old and new are heap Guido van Rossum <guido@python.org> parents: 24685 diff changeset	2894 }
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2895 if (compatible_for_assignment(newto, oldto, "__class__")) {
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2896 Py_INCREF(newto);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2897 Py_TYPE(self) = newto;
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	2898 Py_DECREF(oldto);
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2899 return 0;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2900 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	2901 else {
23541 f6ded6efabcf Add a safeguard against setting the class to something with a Guido van Rossum <guido@python.org> parents: 23127 diff changeset	2902 return -1;
f6ded6efabcf Add a safeguard against setting the class to something with a Guido van Rossum <guido@python.org> parents: 23127 diff changeset	2903 }
20075 aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2904 }
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2905
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	2906 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	2907 {"__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	2908 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	2909 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2910 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	2911
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2912
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2913 /* 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	2914 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	2915 - pickle protocols < 2
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2916 - 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	2917 - 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	2918 */
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2919
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2920 static PyObject *
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2921 import_copy_reg(void)
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2922 {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2923 static PyObject *copy_reg_str;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2924
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2925 if (!copy_reg_str) {
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2926 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	2927 if (copy_reg_str == NULL)
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2928 return NULL;
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	2929 }
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2930
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2931 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	2932 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2933
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2934 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2935 slotnames(PyObject *cls)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2936 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2937 PyObject *clsdict;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2938 PyObject *copy_reg;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2939 PyObject *slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2940
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2941 if (!PyType_Check(cls)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2942 Py_INCREF(Py_None);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2943 return Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2944 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2945
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2946 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	2947 slotnames = PyDict_GetItemString(clsdict, "__slotnames__");
35637 7dd4e6cb9d27 (pedronis, arigo) Armin Rigo <arigo@tunes.org> parents: 35610 diff changeset	2948 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	2949 Py_INCREF(slotnames);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2950 return slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2951 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2952
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2953 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	2954 if (copy_reg == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2955 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2956
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2957 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	2958 Py_DECREF(copy_reg);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2959 if (slotnames != NULL &&
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2960 slotnames != Py_None &&
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2961 !PyList_Check(slotnames))
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2962 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2963 PyErr_SetString(PyExc_TypeError,
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2964 "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	2965 Py_DECREF(slotnames);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2966 slotnames = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2967 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2968
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2969 return slotnames;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2970 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2971
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2972 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2973 reduce_2(PyObject *obj)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2974 {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2975 PyObject cls, getnewargs;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2976 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	2977 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	2978 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	2979 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	2980 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	2981
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2982 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	2983 if (cls == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2984 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2985
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2986 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	2987 if (getnewargs != NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2988 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	2989 Py_DECREF(getnewargs);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2990 if (args != NULL && !PyTuple_Check(args)) {
38871 a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	2991 PyErr_Format(PyExc_TypeError,
a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	2992 "__getnewargs__ should return a tuple, "
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	2993 "not '%.200s'", Py_TYPE(args)->tp_name);
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2994 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2995 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2996 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2997 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2998 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	2999 args = PyTuple_New(0);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3000 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3001 if (args == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3002 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3003
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3004 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	3005 if (getstate != NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3006 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	3007 Py_DECREF(getstate);
29382 585e303a9491 Fix SF #749831, copy raises SystemError when getstate raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 29308 diff changeset	3008 if (state == NULL)
585e303a9491 Fix SF #749831, copy raises SystemError when getstate raises exception Neal Norwitz <nnorwitz@gmail.com> parents: 29308 diff changeset	3009 goto end;
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3010 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3011 else {
31477 ba9aaddeb956 Fixed a bug in object.__reduce_ex__ (reduce_2) when using protocol Jim Fulton <jim@zope.com> parents: 31176 diff changeset	3012 PyErr_Clear();
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3013 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	3014 if (state == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3015 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3016 state = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3017 Py_INCREF(state);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3018 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3019 names = slotnames(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3020 if (names == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3021 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3022 if (names != Py_None) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3023 assert(PyList_Check(names));
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3024 slots = PyDict_New();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3025 if (slots == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3026 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3027 n = 0;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3028 /* 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	3029 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	3030 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	3031 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	3032 PyObject name, value;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3033 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	3034 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	3035 if (value == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3036 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3037 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3038 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	3039 value);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3040 Py_DECREF(value);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3041 if (err)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3042 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3043 n++;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3044 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3045 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3046 if (n) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3047 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	3048 if (state == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3049 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3050 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3051 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3052 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3053
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3054 if (!PyList_Check(obj)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3055 listitems = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3056 Py_INCREF(listitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3057 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3058 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3059 listitems = PyObject_GetIter(obj);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3060 if (listitems == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3061 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3062 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3063
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3064 if (!PyDict_Check(obj)) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3065 dictitems = Py_None;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3066 Py_INCREF(dictitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3067 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3068 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3069 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	3070 if (dictitems == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3071 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3072 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3073
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3074 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	3075 if (copy_reg == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3076 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3077 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	3078 if (newobj == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3079 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3080
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3081 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	3082 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	3083 if (args2 == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3084 goto end;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3085 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	3086 cls = NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3087 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	3088 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	3089 Py_INCREF(v);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3090 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	3091 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3092
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	3093 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	3094
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3095 end:
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3096 Py_XDECREF(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3097 Py_XDECREF(args);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3098 Py_XDECREF(args2);
28566 9ddc498b7013 Missing DECREF. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28514 diff changeset	3099 Py_XDECREF(slots);
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3100 Py_XDECREF(state);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3101 Py_XDECREF(names);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3102 Py_XDECREF(listitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3103 Py_XDECREF(dictitems);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3104 Py_XDECREF(copy_reg);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3105 Py_XDECREF(newobj);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3106 return res;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3107 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3108
41201 4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3109 /*
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3110 * There were two problems when object.__reduce__ and object.__reduce_ex__
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3111 * were implemented in the same function:
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3112 * - trying to pickle an object with a custom __reduce__ method that
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3113 * fell back to object.__reduce__ in certain circumstances led to
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3114 * infinite recursion at Python level and eventual RuntimeError.
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3115 * - Pickling objects that lied about their type by overwriting the
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3116 * __class__ descriptor could lead to infinite recursion at C level
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3117 * and eventual segfault.
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3118 *
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3119 * Because of backwards compatibility, the two methods still have to
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3120 * behave in the same way, even if this is not required by the pickle
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3121 * protocol. This common functionality was moved to the _common_reduce
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3122 * function.
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3123 */
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3124 static PyObject *
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3125 _common_reduce(PyObject *self, int proto)
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3126 {
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3127 PyObject copy_reg, res;
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3128
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3129 if (proto >= 2)
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3130 return reduce_2(self);
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3131
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3132 copy_reg = import_copy_reg();
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3133 if (!copy_reg)
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3134 return NULL;
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3135
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3136 res = PyEval_CallMethod(copy_reg, "_reduce_ex", "(Oi)", self, proto);
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3137 Py_DECREF(copy_reg);
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3138
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3139 return res;
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3140 }
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3141
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3142 static PyObject *
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3143 object_reduce(PyObject self, PyObject args)
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3144 {
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3145 int proto = 0;
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3146
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3147 if (!PyArg_ParseTuple(args, "\|i:__reduce__", &proto))
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3148 return NULL;
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3149
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3150 return _common_reduce(self, proto);
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3151 }
4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3152
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3153 static PyObject *
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3154 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	3155 {
41201 4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3156 PyObject reduce, res;
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3157 int proto = 0;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3158
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3159 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	3160 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3161
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3162 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	3163 if (reduce == NULL)
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3164 PyErr_Clear();
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3165 else {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3166 PyObject cls, clsreduce, *objreduce;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3167 int override;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3168 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	3169 if (cls == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3170 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3171 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3172 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3173 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	3174 Py_DECREF(cls);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3175 if (clsreduce == NULL) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3176 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3177 return NULL;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3178 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3179 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	3180 "__reduce__");
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3181 override = (clsreduce != objreduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3182 Py_DECREF(clsreduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3183 if (override) {
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3184 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	3185 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3186 return res;
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3187 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3188 else
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3189 Py_DECREF(reduce);
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3190 }
b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3191
41201 4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3192 return _common_reduce(self, proto);
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	3193 }
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	3194
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	3195 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	3196 {"__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	3197 PyDoc_STR("helper for pickle")},
41201 4217f3850f0b Patch #1462488: prevent a segfault in object_reduce_ex() by splitting Žiga Seilnacht <ziga.seilnacht@gmail.com> parents: 41188 diff changeset	3198 {"__reduce__", object_reduce, METH_VARARGS,
24795 452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	3199 PyDoc_STR("helper for pickle")},
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	3200 {0}
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	3201 };
48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	3202
28016 b849482c70c6 Implementing the salient parts of __reduce_ex__ in C. Guido van Rossum <guido@python.org> parents: 27948 diff changeset	3203
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3204 PyTypeObject PyBaseObject_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41816 diff changeset	3205 PyVarObject_HEAD_INIT(&PyType_Type, 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3206 "object", /* tp_name */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3207 sizeof(PyObject), /* tp_basicsize */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3208 0, /* tp_itemsize */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37067 diff changeset	3209 object_dealloc, /* tp_dealloc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3210 0, /* tp_print */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3211 0, /* tp_getattr */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3212 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3213 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	3214 object_repr, /* tp_repr */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3215 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3216 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3217 0, /* tp_as_mapping */
43958 103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3218 (hashfunc)_Py_HashPointer, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3219 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	3220 object_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3221 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	3222 PyObject_GenericSetAttr, /* tp_setattro */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3223 0, /* tp_as_buffer */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3224 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	3225 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	3226 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3227 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3228 0, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3229 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3230 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3231 0, /* tp_iternext */
20084 48e93ef3c5b7 - Provisional support for pickling new-style objects. () Guido van Rossum <guido@python.org>* parents: 20076 diff changeset	3232 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	3233 0, /* tp_members */
aae5cf7e5861 Make __class__ assignment possible, when the object structures are the Guido van Rossum <guido@python.org> parents: 20063 diff changeset	3234 object_getsets, /* tp_getset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3235 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3236 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3237 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3238 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3239 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3240 object_init, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3241 PyType_GenericAlloc, /* tp_alloc */
27866 bbbba0ee61fb SF patch #685738 by Michael Stone. Guido van Rossum <guido@python.org> parents: 27831 diff changeset	3242 object_new, /* tp_new */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3243 PyObject_Del, /* tp_free */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3244 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3245
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3246
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3247 /* Initialize the __dict__ in a type object */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3248
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3249 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3250 add_methods(PyTypeObject type, PyMethodDef meth)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3251 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3252 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3253
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3254 for (; meth->ml_name != NULL; meth++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3255 PyObject *descr;
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 30917 diff changeset	3256 if (PyDict_GetItemString(dict, meth->ml_name) &&
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 30917 diff changeset	3257 !(meth->ml_flags & METH_COEXIST))
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 30917 diff changeset	3258 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	3259 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	3260 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	3261 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	3262 "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	3263 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	3264 }
26583 8991f78817c7 SF 548651: Fix the METH_CLASS implementation. Tim Peters <tim.peters@gmail.com> parents: 26575 diff changeset	3265 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	3266 }
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	3267 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	3268 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	3269 if (cfunc == NULL)
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	3270 return -1;
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	3271 descr = PyStaticMethod_New(cfunc);
48dc4a59a50e Inline create_specialmethod() -- since METH_CLASS is done differently Guido van Rossum <guido@python.org> parents: 27811 diff changeset	3272 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	3273 }
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	3274 else {
ddc9543c76a0 Introduce two new flag bits that can be set in a PyMethodDef method Fred Drake <fdrake@acm.org> parents: 22348 diff changeset	3275 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	3276 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3277 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3278 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	3279 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	3280 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3281 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3282 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3283 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3284 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3285
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3286 static int
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	3287 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	3288 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3289 PyObject *dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3290
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3291 for (; memb->name != NULL; memb++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3292 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3293 if (PyDict_GetItemString(dict, memb->name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3294 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3295 descr = PyDescr_NewMember(type, memb);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3296 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3297 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3298 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	3299 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3300 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3301 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3302 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3303 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3304
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3305 static int
20015 ca7af2a5d915 Add optional docstrings to getset descriptors. Fortunately, there's Guido van Rossum <guido@python.org> parents: 20012 diff changeset	3306 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	3307 {
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3308 PyObject *dict = type->tp_dict;
18933 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 for (; gsp->name != NULL; gsp++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3311 PyObject *descr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3312 if (PyDict_GetItemString(dict, gsp->name))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3313 continue;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3314 descr = PyDescr_NewGetSet(type, gsp);
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 if (descr == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3317 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3318 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	3319 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3320 Py_DECREF(descr);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3321 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3322 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3323 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3324
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3325 static void
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3326 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	3327 {
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	3328 Py_ssize_t oldsize, newsize;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3329
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3330 /* Special flag magic */
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3331 if (!type->tp_as_buffer && base->tp_as_buffer) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3332 type->tp_flags &= ~Py_TPFLAGS_HAVE_GETCHARBUFFER;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3333 type->tp_flags \|=
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3334 base->tp_flags & Py_TPFLAGS_HAVE_GETCHARBUFFER;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3335 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3336 if (!type->tp_as_sequence && base->tp_as_sequence) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3337 type->tp_flags &= ~Py_TPFLAGS_HAVE_SEQUENCE_IN;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3338 type->tp_flags \|= base->tp_flags & Py_TPFLAGS_HAVE_SEQUENCE_IN;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3339 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3340 if ((type->tp_flags & Py_TPFLAGS_HAVE_INPLACEOPS) !=
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3341 (base->tp_flags & Py_TPFLAGS_HAVE_INPLACEOPS)) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3342 if ((!type->tp_as_number && base->tp_as_number) \|\|
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3343 (!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	3344 type->tp_flags &= ~Py_TPFLAGS_HAVE_INPLACEOPS;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3345 if (!type->tp_as_number && !type->tp_as_sequence) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3346 type->tp_flags \|= base->tp_flags &
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3347 Py_TPFLAGS_HAVE_INPLACEOPS;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3348 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3349 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3350 /* Wow */
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3351 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3352 if (!type->tp_as_number && base->tp_as_number) {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3353 type->tp_flags &= ~Py_TPFLAGS_CHECKTYPES;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3354 type->tp_flags \|= base->tp_flags & Py_TPFLAGS_CHECKTYPES;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3355 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3356
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3357 /* 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	3358 oldsize = base->tp_basicsize;
13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	3359 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	3360 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	3361 (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	3362 (type->tp_flags & Py_TPFLAGS_HAVE_RICHCOMPARE/GC slots exist/) &&
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3363 (!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	3364 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	3365 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	3366 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	3367 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	3368 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	3369 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3370 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_CLASS) {
21451 be5ca0b25bfd - PyType_Ready(): Initialize the ob_type field to &PyType_Type if it's Guido van Rossum <guido@python.org> parents: 21404 diff changeset	3371 /* 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	3372 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	3373 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	3374 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	3375 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	3376 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	3377 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	3378 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	3379 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	3380 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	3381 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	3382 (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	3383 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	3384 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	3385 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3386 }
19582 13a93a5dcb1d Use new GC API. Remove usage of BASICSIZE macros. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 19551 diff changeset	3387 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	3388
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3389 /* 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	3390
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3391 #undef COPYVAL
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3392 #define COPYVAL(SLOT) \
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3393 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	3394
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3395 COPYVAL(tp_itemsize);
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3396 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_WEAKREFS) {
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3397 COPYVAL(tp_weaklistoffset);
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3398 }
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3399 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_CLASS) {
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3400 COPYVAL(tp_dictoffset);
968d169501f2 Non-function fields, like tp_dictoffset and tp_weaklistoffset, should Guido van Rossum <guido@python.org> parents: 19194 diff changeset	3401 }
40908 d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3402
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3403 /* Setup fast subclass flags */
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3404 if (PyType_IsSubtype(base, (PyTypeObject*)PyExc_BaseException))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3405 type->tp_flags \|= Py_TPFLAGS_BASE_EXC_SUBCLASS;
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3406 else if (PyType_IsSubtype(base, &PyType_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3407 type->tp_flags \|= Py_TPFLAGS_TYPE_SUBCLASS;
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3408 else if (PyType_IsSubtype(base, &PyInt_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3409 type->tp_flags \|= Py_TPFLAGS_INT_SUBCLASS;
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3410 else if (PyType_IsSubtype(base, &PyLong_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3411 type->tp_flags \|= Py_TPFLAGS_LONG_SUBCLASS;
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3412 else if (PyType_IsSubtype(base, &PyString_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3413 type->tp_flags \|= Py_TPFLAGS_STRING_SUBCLASS;
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 44365 diff changeset	3414 #ifdef Py_USING_UNICODE
40908 d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3415 else if (PyType_IsSubtype(base, &PyUnicode_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3416 type->tp_flags \|= Py_TPFLAGS_UNICODE_SUBCLASS;
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 44365 diff changeset	3417 #endif
40908 d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3418 else if (PyType_IsSubtype(base, &PyTuple_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3419 type->tp_flags \|= Py_TPFLAGS_TUPLE_SUBCLASS;
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3420 else if (PyType_IsSubtype(base, &PyList_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3421 type->tp_flags \|= Py_TPFLAGS_LIST_SUBCLASS;
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3422 else if (PyType_IsSubtype(base, &PyDict_Type))
d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 40777 diff changeset	3423 type->tp_flags \|= Py_TPFLAGS_DICT_SUBCLASS;
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3424 }
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3425
44357 174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3426 static char *hash_name_op[] = {
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3427 "__eq__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3428 "__cmp__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3429 "__hash__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3430 NULL
43958 103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3431 };
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3432
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3433 static int
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3434 overrides_hash(PyTypeObject *type)
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3435 {
44357 174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3436 char **p;
43958 103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3437 PyObject *dict = type->tp_dict;
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3438
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3439 assert(dict != NULL);
44357 174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3440 for (p = hash_name_op; *p; p++) {
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	3441 if (PyDict_GetItemString(dict, *p) != NULL)
43958 103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3442 return 1;
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3443 }
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3444 return 0;
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3445 }
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3446
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3447 static void
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3448 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	3449 {
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3450 PyTypeObject *basebase;
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3451
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3452 #undef SLOTDEFINED
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3453 #undef COPYSLOT
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3454 #undef COPYNUM
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3455 #undef COPYSEQ
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3456 #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	3457 #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	3458
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3459 #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	3460 (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	3461 (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	3462
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3463 #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	3464 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	3465
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3466 #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	3467 #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	3468 #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	3469 #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	3470
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3471 /* 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	3472 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	3473
64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3474 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	3475 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	3476 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	3477 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3478 COPYNUM(nb_add);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3479 COPYNUM(nb_subtract);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3480 COPYNUM(nb_multiply);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3481 COPYNUM(nb_divide);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3482 COPYNUM(nb_remainder);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3483 COPYNUM(nb_divmod);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3484 COPYNUM(nb_power);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3485 COPYNUM(nb_negative);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3486 COPYNUM(nb_positive);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3487 COPYNUM(nb_absolute);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3488 COPYNUM(nb_nonzero);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3489 COPYNUM(nb_invert);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3490 COPYNUM(nb_lshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3491 COPYNUM(nb_rshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3492 COPYNUM(nb_and);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3493 COPYNUM(nb_xor);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3494 COPYNUM(nb_or);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3495 COPYNUM(nb_coerce);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3496 COPYNUM(nb_int);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3497 COPYNUM(nb_long);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3498 COPYNUM(nb_float);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3499 COPYNUM(nb_oct);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3500 COPYNUM(nb_hex);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3501 COPYNUM(nb_inplace_add);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3502 COPYNUM(nb_inplace_subtract);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3503 COPYNUM(nb_inplace_multiply);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3504 COPYNUM(nb_inplace_divide);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3505 COPYNUM(nb_inplace_remainder);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3506 COPYNUM(nb_inplace_power);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3507 COPYNUM(nb_inplace_lshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3508 COPYNUM(nb_inplace_rshift);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3509 COPYNUM(nb_inplace_and);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3510 COPYNUM(nb_inplace_xor);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3511 COPYNUM(nb_inplace_or);
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3512 if (base->tp_flags & Py_TPFLAGS_CHECKTYPES) {
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3513 COPYNUM(nb_true_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3514 COPYNUM(nb_floor_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3515 COPYNUM(nb_inplace_true_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3516 COPYNUM(nb_inplace_floor_divide);
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	3517 }
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	3518 if (base->tp_flags & Py_TPFLAGS_HAVE_INDEX) {
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	3519 COPYNUM(nb_index);
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	3520 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3521 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3522
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3523 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	3524 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	3525 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	3526 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3527 COPYSEQ(sq_length);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3528 COPYSEQ(sq_concat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3529 COPYSEQ(sq_repeat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3530 COPYSEQ(sq_item);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3531 COPYSEQ(sq_slice);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3532 COPYSEQ(sq_ass_item);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3533 COPYSEQ(sq_ass_slice);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3534 COPYSEQ(sq_contains);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3535 COPYSEQ(sq_inplace_concat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3536 COPYSEQ(sq_inplace_repeat);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3537 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3538
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3539 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	3540 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	3541 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	3542 basebase = NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3543 COPYMAP(mp_length);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3544 COPYMAP(mp_subscript);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3545 COPYMAP(mp_ass_subscript);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3546 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3547
20384 2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3548 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	3549 basebase = base->tp_base;
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3550 if (basebase->tp_as_buffer == NULL)
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3551 basebase = NULL;
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3552 COPYBUF(bf_getreadbuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3553 COPYBUF(bf_getwritebuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3554 COPYBUF(bf_getsegcount);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3555 COPYBUF(bf_getcharbuffer);
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3556 }
2ba4018de2e3 SF bug [#470040] ParseTuple t# vs subclasses. Tim Peters <tim.peters@gmail.com> parents: 20382 diff changeset	3557
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3558 basebase = base->tp_base;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3559
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3560 COPYSLOT(tp_dealloc);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3561 COPYSLOT(tp_print);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3562 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	3563 type->tp_getattr = base->tp_getattr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3564 type->tp_getattro = base->tp_getattro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3565 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3566 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	3567 type->tp_setattr = base->tp_setattr;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3568 type->tp_setattro = base->tp_setattro;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3569 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3570 /* tp_compare see tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3571 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	3572 /* tp_hash see tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3573 COPYSLOT(tp_call);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3574 COPYSLOT(tp_str);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3575 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_RICHCOMPARE) {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3576 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	3577 type->tp_richcompare == NULL &&
43958 103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3578 type->tp_hash == NULL &&
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3579 !overrides_hash(type))
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	3580 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3581 type->tp_compare = base->tp_compare;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3582 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	3583 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	3584 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3585 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3586 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3587 COPYSLOT(tp_compare);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3588 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3589 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_ITER) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3590 COPYSLOT(tp_iter);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3591 COPYSLOT(tp_iternext);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3592 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3593 if (type->tp_flags & base->tp_flags & Py_TPFLAGS_HAVE_CLASS) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3594 COPYSLOT(tp_descr_get);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3595 COPYSLOT(tp_descr_set);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3596 COPYSLOT(tp_dictoffset);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3597 COPYSLOT(tp_init);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3598 COPYSLOT(tp_alloc);
22848 e589e473f232 Inherit tp_new and tp_is_gc. Guido van Rossum <guido@python.org> parents: 22834 diff changeset	3599 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	3600 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	3601 (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	3602 /* 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	3603 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	3604 }
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	3605 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	3606 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	3607 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	3608 /* 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	3609 * 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	3610 * 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	3611 * 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	3612 */
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	3613 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	3614 }
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	3615 /* 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	3616 * 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	3617 */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3618 }
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3619 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3620
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	3621 static int add_operators(PyTypeObject *);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3622
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3623 int
19040 4df72ea78ae8 - Rename PyType_InitDict() to PyType_Ready(). Guido van Rossum <guido@python.org> parents: 19036 diff changeset	3624 PyType_Ready(PyTypeObject *type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3625 {
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3626 PyObject dict, bases;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3627 PyTypeObject *base;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3628 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3629
23756 8e5f26796620 Undo the last chunk of the previous patch, putting back a useful Guido van Rossum <guido@python.org> parents: 23755 diff changeset	3630 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	3631 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	3632 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	3633 }
19136 6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3634 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	3635
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3636 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	3637
28389 4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3638 #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	3639 /* 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	3640 * 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	3641 * 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	3642 * 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	3643 */
28396 d56282c28a1e Improved new Py_TRACE_REFS gimmicks. Tim Peters <tim.peters@gmail.com> parents: 28390 diff changeset	3644 _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	3645 #endif
4ede57a42c62 Refactored some of the Py_TRACE_REFS code. New private API function Tim Peters <tim.peters@gmail.com> parents: 28288 diff changeset	3646
22871 252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3647 /* 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	3648 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	3649 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	3650 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	3651 Py_INCREF(base);
f6fa649fc4af Patch #980082: Missing INCREF in PyType_Ready. Martin v. Löwis <martin@v.loewis.de> parents: 32916 diff changeset	3652 }
22871 252438bb05d9 - A type can now inherit its metatype from its base type. Previously, Guido van Rossum <guido@python.org> parents: 22859 diff changeset	3653
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3654 /* Now the only way base can still be NULL is if type is
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3655 * &PyBaseObject_Type.
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3656 */
36925 7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	3657
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	3658 /* Initialize the base class */
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3659 if (base && base->tp_dict == NULL) {
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3660 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	3661 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	3662 }
c001e5a15369 PyType_Ready(): initialize the base class a bit earlier, so that if we Guido van Rossum <guido@python.org> parents: 24795 diff changeset	3663
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3664 /* Initialize ob_type if NULL. This means extensions that want to be
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	3665 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	3666 initializing the ob_type field of their type objects. */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3667 /* The test for base != NULL is really unnecessary, since base is only
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3668 NULL when type is &PyBaseObject_Type, and we know its ob_type is
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3669 not NULL (it's initialized to &PyType_Type). But coverity doesn't
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3670 know that. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	3671 if (Py_TYPE(type) == NULL && base != NULL)
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	3672 Py_TYPE(type) = Py_TYPE(base);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3673
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3674 /* Initialize tp_bases */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3675 bases = type->tp_bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3676 if (bases == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3677 if (base == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3678 bases = PyTuple_New(0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3679 else
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	3680 bases = PyTuple_Pack(1, base);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3681 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	3682 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3683 type->tp_bases = bases;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3684 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3685
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3686 /* 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	3687 dict = type->tp_dict;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3688 if (dict == NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3689 dict = PyDict_New();
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3690 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	3691 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	3692 type->tp_dict = dict;
18933 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
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	3695 /* 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	3696 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	3697 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3698 if (type->tp_methods != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3699 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	3700 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3701 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3702 if (type->tp_members != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3703 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	3704 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3705 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3706 if (type->tp_getset != NULL) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3707 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	3708 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3709 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3710
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3711 /* Calculate method resolution order */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3712 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	3713 goto error;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3714 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3715
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3716 /* 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	3717 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	3718 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	3719
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3720 /* Initialize tp_dict properly */
20439 85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3721 bases = type->tp_mro;
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3722 assert(bases != NULL);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3723 assert(PyTuple_Check(bases));
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3724 n = PyTuple_GET_SIZE(bases);
85571d5f6545 Completely get rid of __dynamic__ and the corresponding Guido van Rossum <guido@python.org> parents: 20436 diff changeset	3725 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	3726 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	3727 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	3728 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	3729 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3730
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	3731 /* 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	3732 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	3733 (type->tp_free == NULL \|\| type->tp_free == PyObject_Del)) {
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3734 /* This base class needs to call tp_free, but doesn't have
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3735 * one, or its tp_free is for non-gc'ed objects.
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3736 */
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	3737 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	3738 "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	3739 "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	3740 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	3741 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	3742 }
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	3743
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3744 /* 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	3745 the tp_doc slot.
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3746 */
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3747 if (PyDict_GetItemString(type->tp_dict, "__doc__") == NULL) {
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3748 if (type->tp_doc != NULL) {
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3749 PyObject *doc = PyString_FromString(type->tp_doc);
39129 f2031f15d99d Handle allocation failures gracefully. Found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 38919 diff changeset	3750 if (doc == NULL)
f2031f15d99d Handle allocation failures gracefully. Found with failmalloc. Neal Norwitz <nnorwitz@gmail.com> parents: 38919 diff changeset	3751 goto error;
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3752 PyDict_SetItemString(type->tp_dict, "__doc__", doc);
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3753 Py_DECREF(doc);
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3754 } else {
22774 02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	3755 PyDict_SetItemString(type->tp_dict,
02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	3756 "__doc__", Py_None);
21997 cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3757 }
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3758 }
cb5b4a54ff12 backport loewis' checkin of Michael W. Hudson <mwh@python.net> parents: 21451 diff changeset	3759
43958 103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3760 /* Hack for tp_hash and __hash__.
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3761 If after all that, tp_hash is still NULL, and __hash__ is not in
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3762 tp_dict, set tp_dict['__hash__'] equal to None.
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3763 This signals that __hash__ is not inherited.
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3764 */
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3765 if (type->tp_hash == NULL &&
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3766 PyDict_GetItemString(type->tp_dict, "__hash__") == NULL &&
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3767 PyDict_SetItemString(type->tp_dict, "__hash__", Py_None) < 0)
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3768 {
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3769 goto error;
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3770 }
103b7f955036 Backport of _abccoll.py by Benjamin Arangueren, issue 1383. Guido van Rossum <guido@python.org> parents: 43276 diff changeset	3771
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3772 /* 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	3773 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	3774 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	3775 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	3776 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	3777 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	3778 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	3779 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	3780 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	3781 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	3782 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	3783 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3784
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3785 /* 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	3786 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	3787 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	3788 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	3789 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	3790 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	3791 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	3792 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	3793 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3794
19153 64d4ad73a887 - Big changes to fix SF bug #442833 (a nasty multiple inheritance Guido van Rossum <guido@python.org> parents: 19136 diff changeset	3795 /* 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	3796 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	3797 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	3798 (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	3799 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	3800
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3801 error:
6463cd9db2fc Change PyType_Ready() to use the READY and READYING flags. This makes Guido van Rossum <guido@python.org> parents: 19109 diff changeset	3802 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	3803 return -1;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3804 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3805
20315 7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3806 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	3807 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	3808 {
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	3809 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	3810 int result;
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	3811 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	3812
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3813 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	3814 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	3815 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	3816 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	3817 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	3818 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3819 assert(PyList_Check(list));
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	3820 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	3821 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	3822 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	3823 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	3824 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	3825 if (PyWeakref_GET_OBJECT(ref) == Py_None)
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	3826 return PyList_SetItem(list, i, newobj);
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	3827 }
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	3828 result = PyList_Append(list, newobj);
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	3829 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	3830 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	3831 }
7b41f7a2e528 Keep track of a type's subclasses (subtypes), in tp_subclasses, which Guido van Rossum <guido@python.org> parents: 20296 diff changeset	3832
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3833 static void
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3834 remove_subclass(PyTypeObject base, PyTypeObject type)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3835 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3836 Py_ssize_t i;
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3837 PyObject list, ref;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3838
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3839 list = base->tp_subclasses;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3840 if (list == NULL) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3841 return;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3842 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3843 assert(PyList_Check(list));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3844 i = PyList_GET_SIZE(list);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3845 while (--i >= 0) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3846 ref = PyList_GET_ITEM(list, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3847 assert(PyWeakref_CheckRef(ref));
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3848 if (PyWeakref_GET_OBJECT(ref) == (PyObject*)type) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3849 /* this can't fail, right? */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3850 PySequence_DelItem(list, i);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3851 return;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3852 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3853 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	3854 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3855
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3856 static int
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3857 check_num_args(PyObject *ob, int n)
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3858 {
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3859 if (!PyTuple_CheckExact(ob)) {
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3860 PyErr_SetString(PyExc_SystemError,
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3861 "PyArg_UnpackTuple() argument list is not a tuple");
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3862 return 0;
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3863 }
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3864 if (n == PyTuple_GET_SIZE(ob))
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3865 return 1;
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3866 PyErr_Format(
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3867 PyExc_TypeError,
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3868 "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	3869 return 0;
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3870 }
381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3871
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3872 /* 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	3873
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3874 /* There's a wrapper function for each distinct function typedef used
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	3875 for type object slots (e.g. binaryfunc, ternaryfunc, etc.). There's a
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3876 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	3877 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	3878 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	3879
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3880 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3881 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	3882 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3883 lenfunc func = (lenfunc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	3884 Py_ssize_t res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3885
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3886 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	3887 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3888 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3889 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3890 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3891 return PyInt_FromLong((long)res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3892 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3893
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3894 static PyObject *
30670 7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3895 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	3896 {
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3897 inquiry func = (inquiry)wrapped;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3898 int res;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3899
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3900 if (!check_num_args(args, 0))
30670 7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3901 return NULL;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3902 res = (*func)(self);
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3903 if (res == -1 && PyErr_Occurred())
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3904 return NULL;
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3905 return PyBool_FromLong((long)res);
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3906 }
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3907
7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	3908 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3909 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	3910 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3911 binaryfunc func = (binaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3912 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3913
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3914 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	3915 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3916 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	3917 return (*func)(self, other);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3918 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3919
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3920 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	3921 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	3922 {
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3923 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	3924 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	3925
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3926 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	3927 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3928 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	3929 if (!(self->ob_type->tp_flags & Py_TPFLAGS_CHECKTYPES) &&
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3930 !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	3931 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	3932 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	3933 }
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3934 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	3935 }
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3936
26b5f8b94872 It turned out not so difficult to support old-style numbers (those Guido van Rossum <guido@python.org> parents: 20320 diff changeset	3937 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3938 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	3939 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3940 binaryfunc func = (binaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3941 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3942
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3943 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	3944 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3945 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	3946 if (!(self->ob_type->tp_flags & Py_TPFLAGS_CHECKTYPES) &&
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	3947 !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	3948 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	3949 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	3950 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3951 return (*func)(other, self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3952 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3953
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3954 static PyObject *
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3955 wrap_coercefunc(PyObject self, PyObject args, void *wrapped)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3956 {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3957 coercion func = (coercion)wrapped;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3958 PyObject other, res;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3959 int ok;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3960
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3961 if (!check_num_args(args, 1))
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3962 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	3963 other = PyTuple_GET_ITEM(args, 0);
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3964 ok = func(&self, &other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3965 if (ok < 0)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3966 return NULL;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3967 if (ok > 0) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3968 Py_INCREF(Py_NotImplemented);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3969 return Py_NotImplemented;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3970 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3971 res = PyTuple_New(2);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3972 if (res == NULL) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3973 Py_DECREF(self);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3974 Py_DECREF(other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3975 return NULL;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3976 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3977 PyTuple_SET_ITEM(res, 0, self);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3978 PyTuple_SET_ITEM(res, 1, other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3979 return res;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3980 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	3981
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3982 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3983 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	3984 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3985 ternaryfunc func = (ternaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3986 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3987 PyObject *third = Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3988
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3989 /* 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	3990
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	3991 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	3992 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3993 return (*func)(self, other, third);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3994 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	3995
20168 091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3996 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	3997 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	3998 {
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	3999 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	4000 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	4001 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	4002
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	4003 /* 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	4004
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	4005 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	4006 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	4007 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	4008 }
091e9e3ceeaf Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting Guido van Rossum <guido@python.org> parents: 20140 diff changeset	4009
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4010 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4011 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	4012 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4013 unaryfunc func = (unaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4014
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4015 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	4016 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4017 return (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4018 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4019
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4020 static PyObject *
37308 aaa04bfafc58 Minor bugs in the __index__ code (PEP 357), with tests. Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	4021 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	4022 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4023 ssizeargfunc func = (ssizeargfunc)wrapped;
37308 aaa04bfafc58 Minor bugs in the __index__ code (PEP 357), with tests. Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	4024 PyObject* o;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4025 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4026
37308 aaa04bfafc58 Minor bugs in the __index__ code (PEP 357), with tests. Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	4027 if (!PyArg_UnpackTuple(args, "", 1, 1, &o))
aaa04bfafc58 Minor bugs in the __index__ code (PEP 357), with tests. Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	4028 return NULL;
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39415 diff changeset	4029 i = PyNumber_AsSsize_t(o, PyExc_OverflowError);
37308 aaa04bfafc58 Minor bugs in the __index__ code (PEP 357), with tests. Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	4030 if (i == -1 && PyErr_Occurred())
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4031 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4032 return (*func)(self, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4033 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4034
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4035 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	4036 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	4037 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4038 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4039
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39415 diff changeset	4040 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	4041 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	4042 return -1;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4043 if (i < 0) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4044 PySequenceMethods *sq = Py_TYPE(self)->tp_as_sequence;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4045 if (sq && sq->sq_length) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4046 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	4047 if (n < 0)
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4048 return -1;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4049 i += n;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4050 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4051 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4052 return i;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4053 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4054
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4055 static PyObject *
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4056 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	4057 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4058 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	4059 PyObject *arg;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4060 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	4061
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4062 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	4063 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	4064 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	4065 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	4066 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4067 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	4068 }
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4069 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	4070 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	4071 return NULL;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4072 }
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4073
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4074 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4075 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	4076 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4077 ssizessizeargfunc func = (ssizessizeargfunc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4078 Py_ssize_t i, j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4079
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4080 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	4081 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4082 return (*func)(self, i, j);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4083 }
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 PyObject *
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4086 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	4087 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4088 ssizeobjargproc func = (ssizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4089 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4090 int res;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4091 PyObject arg, value;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4092
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	4093 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	4094 return NULL;
051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4095 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	4096 if (i == -1 && PyErr_Occurred())
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4097 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4098 res = (*func)(self, i, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4099 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4100 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4101 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4102 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4103 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4104
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4105 static PyObject *
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4106 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	4107 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4108 ssizeobjargproc func = (ssizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4109 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4110 int res;
19353 051d8e380f38 Address SF bug #442813. The sequence getitem wrappers should do Guido van Rossum <guido@python.org> parents: 19349 diff changeset	4111 PyObject *arg;
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4112
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4113 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	4114 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4115 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	4116 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	4117 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	4118 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4119 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	4120 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	4121 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4122 Py_INCREF(Py_None);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4123 return Py_None;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4124 }
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4125
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4126 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4127 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	4128 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4129 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4130 Py_ssize_t i, j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4131 int res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4132 PyObject *value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4133
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4134 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	4135 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4136 res = (*func)(self, i, j, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4137 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4138 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4139 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4140 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4141 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4142
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4143 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	4144 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	4145 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4146 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4147 Py_ssize_t i, j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4148 int res;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4149
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4150 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	4151 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	4152 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	4153 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	4154 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	4155 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	4156 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	4157 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	4158
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4159 /* 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	4160 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4161 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	4162 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4163 objobjproc func = (objobjproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4164 int res;
30660 36992ca918a3 Fix leak introduced by previous typeobject.c checkin. Guido van Rossum <guido@python.org> parents: 30659 diff changeset	4165 PyObject *value;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4166
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4167 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	4168 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4169 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	4170 res = (*func)(self, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4171 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4172 return NULL;
30660 36992ca918a3 Fix leak introduced by previous typeobject.c checkin. Guido van Rossum <guido@python.org> parents: 30659 diff changeset	4173 else
36992ca918a3 Fix leak introduced by previous typeobject.c checkin. Guido van Rossum <guido@python.org> parents: 30659 diff changeset	4174 return PyBool_FromLong(res);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4175 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4176
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4177 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4178 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	4179 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4180 objobjargproc func = (objobjargproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4181 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4182 PyObject key, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4183
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	4184 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	4185 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4186 res = (*func)(self, key, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4187 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4188 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4189 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4190 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4191 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4192
18941 013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4193 static PyObject *
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4194 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	4195 {
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4196 objobjargproc func = (objobjargproc)wrapped;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4197 int res;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4198 PyObject *key;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4199
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4200 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	4201 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4202 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	4203 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	4204 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	4205 return NULL;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4206 Py_INCREF(Py_None);
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4207 return Py_None;
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4208 }
013cffcfd8a3 Fix SF #442791 (revisited): No __delitem__ wrapper was defined. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	4209
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4210 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4211 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	4212 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4213 cmpfunc func = (cmpfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4214 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4215 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4216
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4217 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	4218 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4219 other = PyTuple_GET_ITEM(args, 0);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4220 if (Py_TYPE(other)->tp_compare != func &&
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4221 !PyType_IsSubtype(Py_TYPE(other), Py_TYPE(self))) {
19964 43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	4222 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	4223 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	4224 "%s.__cmp__(x,y) requires y to be a '%s', not a '%s'",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4225 Py_TYPE(self)->tp_name,
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4226 Py_TYPE(self)->tp_name,
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4227 Py_TYPE(other)->tp_name);
19964 43e5fd54f8c9 wrap_cmpfunc(): added a safety check for the __cmp__ wrapper. We can Guido van Rossum <guido@python.org> parents: 19950 diff changeset	4228 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	4229 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4230 res = (*func)(self, other);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4231 if (PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4232 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4233 return PyInt_FromLong((long)res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4234 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4235
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4236 /* 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	4237 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	4238 static int
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4239 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	4240 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4241 PyTypeObject *type = Py_TYPE(self);
28608 8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4242 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	4243 type = type->tp_base;
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	4244 /* If type is NULL now, this is a really weird type.
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	4245 In the spirit of backwards compatibility (?), just shut up. */
36925 7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	4246 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	4247 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	4248 "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	4249 what,
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4250 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	4251 return 0;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4252 }
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4253 return 1;
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4254 }
8322077d234c Close off the "Verre Carlo hack" as discussed on python-dev. Guido van Rossum <guido@python.org> parents: 28607 diff changeset	4255
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4256 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4257 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	4258 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4259 setattrofunc func = (setattrofunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4260 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4261 PyObject name, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4262
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	4263 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	4264 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	4265 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	4266 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4267 res = (*func)(self, name, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4268 if (res < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4269 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4270 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4271 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4272 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4273
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4274 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4275 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	4276 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4277 setattrofunc func = (setattrofunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4278 int res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4279 PyObject *name;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4280
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4281 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	4282 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4283 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	4284 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	4285 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4286 res = (*func)(self, name, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4287 if (res < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4288 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4289 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4290 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4291 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4292
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4293 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4294 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	4295 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4296 hashfunc func = (hashfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4297 long res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4298
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4299 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	4300 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4301 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4302 if (res == -1 && PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4303 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4304 return PyInt_FromLong(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4305 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4306
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4307 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	4308 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	4309 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4310 ternaryfunc func = (ternaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4311
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	4312 return (*func)(self, args, kwds);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4313 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4314
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4315 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4316 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	4317 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4318 richcmpfunc func = (richcmpfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4319 PyObject *other;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4320
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4321 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	4322 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4323 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	4324 return (*func)(self, other, op);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4325 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4326
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4327 #undef RICHCMP_WRAPPER
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4328 #define RICHCMP_WRAPPER(NAME, OP) \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4329 static PyObject * \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4330 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	4331 { \
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4332 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	4333 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4334
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	4335 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	4336 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	4337 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	4338 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	4339 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	4340 RICHCMP_WRAPPER(ge, Py_GE)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4341
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4342 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4343 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	4344 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4345 unaryfunc func = (unaryfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4346 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4347
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4348 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	4349 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4350 res = (*func)(self);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4351 if (res == NULL && !PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4352 PyErr_SetNone(PyExc_StopIteration);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4353 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4354 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4355
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4356 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4357 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	4358 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4359 descrgetfunc func = (descrgetfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4360 PyObject *obj;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4361 PyObject *type = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4362
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	4363 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	4364 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	4365 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	4366 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	4367 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	4368 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	4369 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	4370 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	4371 "__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	4372 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	4373 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4374 return (*func)(self, obj, type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4375 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4376
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4377 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	4378 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	4379 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4380 descrsetfunc func = (descrsetfunc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4381 PyObject obj, value;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4382 int ret;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4383
30671 adc60015670a Use the simpler and faster PyArg_UnpackTuple() instead of Raymond Hettinger <python@rcn.com> parents: 30670 diff changeset	4384 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	4385 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4386 ret = (*func)(self, obj, value);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4387 if (ret < 0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4388 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4389 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4390 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4391 }
24614 40eb80dc4250 Fix SF bug 574207 (chained __slots__ dealloc segfault). Guido van Rossum <guido@python.org> parents: 24460 diff changeset	4392
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4393 static PyObject *
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4394 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	4395 {
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4396 descrsetfunc func = (descrsetfunc)wrapped;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4397 PyObject *obj;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4398 int ret;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4399
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4400 if (!check_num_args(args, 1))
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4401 return NULL;
31176 381140e7e9d7 Improve argument checking speed. Raymond Hettinger <python@rcn.com> parents: 31172 diff changeset	4402 obj = PyTuple_GET_ITEM(args, 0);
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4403 ret = (*func)(self, obj, NULL);
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4404 if (ret < 0)
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4405 return NULL;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4406 Py_INCREF(Py_None);
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4407 return Py_None;
2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	4408 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4409
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4410 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	4411 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	4412 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4413 initproc func = (initproc)wrapped;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4414
20599 ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	4415 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	4416 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4417 Py_INCREF(Py_None);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4418 return Py_None;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4419 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4420
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4421 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	4422 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	4423 {
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4424 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	4425 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	4426
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	4427 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	4428 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	4429 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	4430 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	4431 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	4432 "%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	4433 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	4434 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	4435 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	4436 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	4437 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	4438 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	4439 "%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	4440 type->tp_name,
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4441 Py_TYPE(arg0)->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	4442 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	4443 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	4444 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	4445 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	4446 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	4447 "%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	4448 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4449 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4450 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4451 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	4452 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	4453 }
19429 9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4454
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4455 /* 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	4456 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	4457 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	4458 staticbase = subtype;
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4459 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	4460 staticbase = staticbase->tp_base;
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	4461 /* If staticbase is NULL now, it is a really weird type.
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	4462 In the spirit of backwards compatibility (?), just shut up. */
36925 7c17e9221f94 Fix three nits found by Coverity, adding null checks and comments. Guido van Rossum <guido@python.org> parents: 36882 diff changeset	4463 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	4464 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	4465 "%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	4466 type->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4467 subtype->tp_name,
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4468 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	4469 return NULL;
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4470 }
9cf669581110 Merge changes from r22a2-branch back into trunk. Also, change patch Barry Warsaw <barry@python.org> parents: 19353 diff changeset	4471
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	4472 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	4473 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	4474 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	4475 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	4476 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	4477 return res;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4478 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4479
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	4480 static struct PyMethodDef tp_new_methoddef[] = {
41816 ec83d21065aa Stop using METH_OLDARGS implicitly Neal Norwitz <nnorwitz@gmail.com> parents: 41576 diff changeset	4481 {"__new__", (PyCFunction)tp_new_wrapper, METH_VARARGS\|METH_KEYWORDS,
24795 452d6a916196 Allow more docstrings to be removed during compilation Neal Norwitz <nnorwitz@gmail.com> parents: 24789 diff changeset	4482 PyDoc_STR("T.__new__(S, ...) -> "
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	4483 "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	4484 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4485 };
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4486
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4487 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	4488 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	4489 {
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	4490 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	4491
20445 27ab0327b2fc Get rid of __defined__ and tp_defined -- there's no need to Guido van Rossum <guido@python.org> parents: 20439 diff changeset	4492 if (PyDict_GetItemString(type->tp_dict, "__new__") != NULL)
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	4493 return 0;
3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	4494 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	4495 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	4496 return -1;
32407 aaf9295ed45b Cosmetic spacing fix. Raymond Hettinger <python@rcn.com> parents: 32404 diff changeset	4497 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	4498 Py_DECREF(func);
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	4499 return -1;
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	4500 }
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	4501 Py_DECREF(func);
75e5d1e8b617 Fix leak found by Eric Huss. Raymond Hettinger <python@rcn.com> parents: 32323 diff changeset	4502 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	4503 }
c1daa94c21d8 A totally new way to do the __new__ wrapper. This should address the Guido van Rossum <guido@python.org> parents: 18941 diff changeset	4504
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	4505 /* Slot wrappers that call the corresponding __foo__ slot. See comments
3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	4506 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	4507
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4508 #define SLOT0(FUNCNAME, OPSTR) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4509 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4510 FUNCNAME(PyObject *self) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4511 { \
19540 e141b392b61d Fix a typo in SLOT0 macro for the declaration of cache_str. Guido van Rossum <guido@python.org> parents: 19538 diff changeset	4512 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4513 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	4514 }
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4515
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4516 #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	4517 static PyObject * \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4518 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	4519 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4520 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4521 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	4522 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4523
27124 d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4524 /* 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	4525 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	4526 static int
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4527 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	4528 {
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4529 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	4530 int ok;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4531
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4532 b = PyObject_GetAttrString((PyObject *)(Py_TYPE(right)), name);
27124 d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4533 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	4534 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4535 /* 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	4536 return 0;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4537 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4538
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4539 a = PyObject_GetAttrString((PyObject *)(Py_TYPE(left)), name);
27124 d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4540 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	4541 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4542 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	4543 /* 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	4544 return 1;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4545 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4546
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4547 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	4548 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	4549 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	4550 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	4551 PyErr_Clear();
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4552 return 0;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4553 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4554
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4555 return ok;
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4556 }
d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4557
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4558
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4559 #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	4560 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4561 FUNCNAME(PyObject self, PyObject other) \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4562 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4563 static PyObject cache_str, rcache_str; \
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4564 int do_other = Py_TYPE(self) != Py_TYPE(other) && \
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4565 Py_TYPE(other)->tp_as_number != NULL && \
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4566 Py_TYPE(other)->tp_as_number->SLOTNAME == TESTFUNC; \
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4567 if (Py_TYPE(self)->tp_as_number != NULL && \
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4568 Py_TYPE(self)->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	4569 PyObject *r; \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4570 if (do_other && \
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4571 PyType_IsSubtype(Py_TYPE(other), Py_TYPE(self)) && \
27124 d1850a36ae41 Add a refinement to SLOT1BINFULL() that fixes the problem reported in Guido van Rossum <guido@python.org> parents: 26964 diff changeset	4572 method_is_overloaded(self, other, ROPSTR)) { \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4573 r = call_maybe( \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4574 other, ROPSTR, &rcache_str, "(O)", self); \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4575 if (r != Py_NotImplemented) \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4576 return r; \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4577 Py_DECREF(r); \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4578 do_other = 0; \
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4579 } \
19913 ca0f54dacdd8 Add call_maybe(): a variant of call_method() that returns Guido van Rossum <guido@python.org> parents: 19911 diff changeset	4580 r = call_maybe( \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4581 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	4582 if (r != Py_NotImplemented \|\| \
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4583 Py_TYPE(other) == Py_TYPE(self)) \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4584 return r; \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4585 Py_DECREF(r); \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4586 } \
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4587 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	4588 return call_maybe( \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4589 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	4590 } \
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4591 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	4592 return Py_NotImplemented; \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4593 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4594
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4595 #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	4596 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	4597
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4598 #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	4599 static PyObject * \
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4600 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	4601 { \
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4602 static PyObject *cache_str; \
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4603 return call_method(self, OPSTR, &cache_str, \
cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4604 "(" ARGCODES ")", arg1, arg2); \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4605 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4606
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4607 static Py_ssize_t
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4608 slot_sq_length(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4609 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4610 static PyObject *len_str;
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4611 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	4612 Py_ssize_t len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4613
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4614 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4615 return -1;
39464 48f1dbc57845 Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	4616 len = PyInt_AsSsize_t(res);
20197 b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4617 Py_DECREF(res);
24376 aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4618 if (len < 0) {
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39921 diff changeset	4619 if (!PyErr_Occurred())
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39921 diff changeset	4620 PyErr_SetString(PyExc_ValueError,
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39921 diff changeset	4621 "__len__() should return >= 0");
24376 aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4622 return -1;
aa9e054270a2 Complain if __len__() returns < 0, just like classic classes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24280 diff changeset	4623 }
20197 b4f0f10a6c5f slot_sq_length(): squash a leak. Guido van Rossum <guido@python.org> parents: 20195 diff changeset	4624 return len;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4625 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4626
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4627 /* 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	4628 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	4629 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4630 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	4631 {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4632 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	4633 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	4634 descrgetfunc f;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4635
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4636 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	4637 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	4638 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	4639 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4640 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4641 func = _PyType_Lookup(Py_TYPE(self), getitem_str);
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4642 if (func != NULL) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4643 if ((f = Py_TYPE(func)->tp_descr_get) == NULL)
20229 8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4644 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	4645 else {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4646 func = f(func, self, (PyObject *)(Py_TYPE(self)));
25853 680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4647 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	4648 return NULL;
680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4649 }
680bfcc9ca06 Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman Neal Norwitz <nnorwitz@gmail.com> parents: 25839 diff changeset	4650 }
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	4651 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	4652 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	4653 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	4654 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	4655 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	4656 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	4657 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	4658 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	4659 return retval;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4660 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4661 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4662 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4663 else {
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4664 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	4665 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4666 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	4667 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	4668 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	4669 return NULL;
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4670 }
8bad55edfdf3 EXPERIMENTAL speedup of slot_sq_item. This sped up the following Guido van Rossum <guido@python.org> parents: 20225 diff changeset	4671
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4672 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	4673
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4674 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4675 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	4676 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4677 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	4678 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	4679
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4680 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	4681 res = call_method(self, "__delitem__", &delitem_str,
37880 96aa5ce86445 Fix variable/format-char discrepancy in new-style class __getitem__, Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	4682 "(n)", index);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4683 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4684 res = call_method(self, "__setitem__", &setitem_str,
37880 96aa5ce86445 Fix variable/format-char discrepancy in new-style class __getitem__, Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	4685 "(nO)", index, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4686 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4687 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4688 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4689 return 0;
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
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4692 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4693 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	4694 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4695 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	4696 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	4697
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4698 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	4699 res = call_method(self, "__delslice__", &delslice_str,
37880 96aa5ce86445 Fix variable/format-char discrepancy in new-style class __getitem__, Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	4700 "(nn)", i, j);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4701 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4702 res = call_method(self, "__setslice__", &setslice_str,
37880 96aa5ce86445 Fix variable/format-char discrepancy in new-style class __getitem__, Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	4703 "(nnO)", i, j, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4704 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4705 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4706 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4707 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4708 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4709
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4710 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4711 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	4712 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4713 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	4714 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	4715
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	4716 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	4717
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4718 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	4719 if (func != NULL) {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	4720 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	4721 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4722 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4723 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4724 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	4725 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4726 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4727 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	4728 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	4729 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	4730 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	4731 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4732 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4733 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	4734 /* 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	4735 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	4736 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	4737 }
33319458fe99 slot_sq_contains(): This leaked a reference to the result of calling Tim Peters <tim.peters@gmail.com> parents: 28389 diff changeset	4738 return result;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4739 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4740
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4741 #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	4742
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4743 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	4744
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4745 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4746 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	4747 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4748 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	4749 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	4750
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4751 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	4752 res = call_method(self, "__delitem__", &delitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4753 "(O)", key);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4754 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4755 res = call_method(self, "__setitem__", &setitem_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4756 "(OO)", key, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4757 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4758 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4759 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4760 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4761 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4762
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4763 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	4764 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	4765 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	4766 SLOT1BIN(slot_nb_divide, nb_divide, "__div__", "__rdiv__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4767 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	4768 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	4769
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24250 diff changeset	4770 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	4771
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4772 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	4773 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	4774
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4775 static PyObject *
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4776 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	4777 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	4778 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	4779
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4780 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	4781 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	4782 /* 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	4783 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	4784 slot_nb_power, so check before calling self.__pow__. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4785 if (Py_TYPE(self)->tp_as_number != NULL &&
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4786 Py_TYPE(self)->tp_as_number->nb_power == slot_nb_power) {
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	4787 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	4788 "(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	4789 }
41097e92f560 Three's a charm: yet another fix for SF bug 551412. Thinking again Guido van Rossum <guido@python.org> parents: 23666 diff changeset	4790 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	4791 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	4792 }
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4793
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4794 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	4795 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	4796 SLOT0(slot_nb_absolute, "__abs__")
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4797
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4798 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4799 slot_nb_nonzero(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4800 {
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4801 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	4802 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	4803 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	4804
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4805 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	4806 if (func == NULL) {
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4807 if (PyErr_Occurred())
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4808 return -1;
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4809 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	4810 if (func == NULL)
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4811 return PyErr_Occurred() ? -1 : 1;
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	4812 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4813 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	4814 if (args != NULL) {
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4815 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	4816 Py_DECREF(args);
93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4817 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	4818 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	4819 result = PyObject_IsTrue(temp);
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4820 else {
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4821 PyErr_Format(PyExc_TypeError,
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4822 "__nonzero__ should return "
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4823 "bool or int, returned %s",
60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4824 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	4825 result = -1;
29607 60b53db14aa3 Check return type of __nonzero__() method. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29442 diff changeset	4826 }
26575 93b5ca9423eb slot_nb_nonzero(): Another leak uncovered by the sandbox datetime Tim Peters <tim.peters@gmail.com> parents: 26559 diff changeset	4827 Py_DECREF(temp);
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4828 }
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4829 }
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4830 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	4831 return result;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4832 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4833
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4834
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39415 diff changeset	4835 static PyObject *
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4836 slot_nb_index(PyObject *self)
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4837 {
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4838 static PyObject *index_str;
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39415 diff changeset	4839 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	4840 }
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4841
6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36866 diff changeset	4842
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4843 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	4844 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	4845 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	4846 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	4847 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	4848 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	4849
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4850 static int
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4851 slot_nb_coerce(PyObject a, PyObject b)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4852 {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4853 static PyObject *coerce_str;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4854 PyObject self = a, other = b;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4855
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4856 if (self->ob_type->tp_as_number != NULL &&
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4857 self->ob_type->tp_as_number->nb_coerce == slot_nb_coerce) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4858 PyObject *r;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4859 r = call_maybe(
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4860 self, "__coerce__", &coerce_str, "(O)", other);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4861 if (r == NULL)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4862 return -1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4863 if (r == Py_NotImplemented) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4864 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4865 }
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4866 else {
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4867 if (!PyTuple_Check(r) \|\| PyTuple_GET_SIZE(r) != 2) {
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4868 PyErr_SetString(PyExc_TypeError,
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4869 "__coerce__ didn't return a 2-tuple");
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4870 Py_DECREF(r);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4871 return -1;
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4872 }
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4873 *a = PyTuple_GET_ITEM(r, 0);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4874 Py_INCREF(*a);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4875 *b = PyTuple_GET_ITEM(r, 1);
8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4876 Py_INCREF(*b);
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4877 Py_DECREF(r);
20204 8e6f604b0799 Miscellaneous code fiddling: Guido van Rossum <guido@python.org> parents: 20197 diff changeset	4878 return 0;
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4879 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4880 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4881 if (other->ob_type->tp_as_number != NULL &&
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4882 other->ob_type->tp_as_number->nb_coerce == slot_nb_coerce) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4883 PyObject *r;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4884 r = call_maybe(
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4885 other, "__coerce__", &coerce_str, "(O)", self);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4886 if (r == NULL)
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4887 return -1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4888 if (r == Py_NotImplemented) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4889 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4890 return 1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4891 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4892 if (!PyTuple_Check(r) \|\| PyTuple_GET_SIZE(r) != 2) {
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4893 PyErr_SetString(PyExc_TypeError,
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4894 "__coerce__ didn't return a 2-tuple");
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4895 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4896 return -1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4897 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4898 *a = PyTuple_GET_ITEM(r, 1);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4899 Py_INCREF(*a);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4900 *b = PyTuple_GET_ITEM(r, 0);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4901 Py_INCREF(*b);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4902 Py_DECREF(r);
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4903 return 0;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4904 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4905 return 1;
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4906 }
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20095 diff changeset	4907
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4908 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	4909 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	4910 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	4911 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	4912 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	4913 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	4914 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	4915 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	4916 SLOT1(slot_nb_inplace_divide, "__idiv__", PyObject *, "O")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4917 SLOT1(slot_nb_inplace_remainder, "__imod__", PyObject *, "O")
40777 f6f391d1d050 Bug #1653736: Properly discard third argument to slot_nb_inplace_power. Martin v. Löwis <martin@v.loewis.de> parents: 40707 diff changeset	4918 /* Can't use SLOT1 here, because nb_inplace_power is ternary */
f6f391d1d050 Bug #1653736: Properly discard third argument to slot_nb_inplace_power. Martin v. Löwis <martin@v.loewis.de> parents: 40707 diff changeset	4919 static PyObject *
f6f391d1d050 Bug #1653736: Properly discard third argument to slot_nb_inplace_power. Martin v. Löwis <martin@v.loewis.de> parents: 40707 diff changeset	4920 slot_nb_inplace_power(PyObject self, PyObject arg1, PyObject *arg2)
f6f391d1d050 Bug #1653736: Properly discard third argument to slot_nb_inplace_power. Martin v. Löwis <martin@v.loewis.de> parents: 40707 diff changeset	4921 {
f6f391d1d050 Bug #1653736: Properly discard third argument to slot_nb_inplace_power. Martin v. Löwis <martin@v.loewis.de> parents: 40707 diff changeset	4922 static PyObject *cache_str;
f6f391d1d050 Bug #1653736: Properly discard third argument to slot_nb_inplace_power. Martin v. Löwis <martin@v.loewis.de> parents: 40707 diff changeset	4923 return call_method(self, "__ipow__", &cache_str, "(" "O" ")", arg1);
f6f391d1d050 Bug #1653736: Properly discard third argument to slot_nb_inplace_power. Martin v. Löwis <martin@v.loewis.de> parents: 40707 diff changeset	4924 }
19082 88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4925 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	4926 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	4927 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	4928 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	4929 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	4930 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	4931 "__floordiv__", "__rfloordiv__")
88d124c74766 Proper support for binary operators, including true division and floor Guido van Rossum <guido@python.org> parents: 19070 diff changeset	4932 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	4933 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	4934 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	4935
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4936 static int
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4937 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	4938 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4939 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	4940 static PyObject *cmp_str;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	4941 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	4942
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	4943 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	4944 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4945 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4946 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4947 else {
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	4948 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	4949 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4950 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4951 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	4952 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	4953 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4954 }
23967 1a8096bb4c48 Fix SF bug 572567: Memory leak in object comparison. Raymond Hettinger <python@rcn.com> parents: 23950 diff changeset	4955 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	4956 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	4957 if (res == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4958 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4959 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	4960 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4961 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	4962 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4963 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	4964 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4965 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4966 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4967 return 2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4968 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4969
19970 f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4970 /* 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	4971 int
f761cab28c1c Hopefully fix 3-way comparisons. This unfortunately adds yet another Guido van Rossum <guido@python.org> parents: 19964 diff changeset	4972 _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	4973 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4974 int c;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4975
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4976 if (Py_TYPE(self)->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	4977 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	4978 if (c <= 1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4979 return c;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4980 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	4981 if (Py_TYPE(other)->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	4982 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	4983 if (c < -1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4984 return -2;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4985 if (c <= 1)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4986 return -c;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4987 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4988 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	4989 (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	4990 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	4991
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4992 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4993 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	4994 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	4995 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	4996 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	4997
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	4998 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	4999 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5000 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	5001 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5002 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5003 }
19476 0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	5004 PyErr_Clear();
0e70df98424e repr's converted to using PyString_FromFormat() instead of sprintf'ing Barry Warsaw <barry@python.org> parents: 19469 diff changeset	5005 return PyString_FromFormat("<%s object at %p>",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5006 Py_TYPE(self)->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	5007 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5008
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5009 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5010 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	5011 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5012 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	5013 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	5014
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	5015 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	5016 if (func != NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5017 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	5018 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5019 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5020 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5021 else {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5022 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5023 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	5024 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5025 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5026
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5027 static long
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5028 slot_tp_hash(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5029 {
26559 0dbf98ee118e slot_tp_hash(): In the normal path, this leaked a reference to the Tim Peters <tim.peters@gmail.com> parents: 26448 diff changeset	5030 PyObject *func;
19535 9753608e2d57 Change in policy: when a slot_tp_xxx function looks for the __xxx__ method, Guido van Rossum <guido@python.org> parents: 19476 diff changeset	5031 static PyObject hash_str, eq_str, *cmp_str;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5032 long h;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5033
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	5034 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	5035
44357 174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5036 if (func != NULL && func != Py_None) {
26559 0dbf98ee118e slot_tp_hash(): In the normal path, this leaked a reference to the Tim Peters <tim.peters@gmail.com> parents: 26448 diff changeset	5037 PyObject *res = PyEval_CallObject(func, NULL);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5038 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5039 if (res == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5040 return -1;
39410 5b9692f6629f __hash__ may now return long int; the final hash Martin v. Löwis <martin@v.loewis.de> parents: 39367 diff changeset	5041 if (PyLong_Check(res))
39415 9a8081cf4a70 Fix and test for an infinite C recursion. Armin Rigo <arigo@tunes.org> parents: 39410 diff changeset	5042 h = PyLong_Type.tp_hash(res);
39410 5b9692f6629f __hash__ may now return long int; the final hash Martin v. Löwis <martin@v.loewis.de> parents: 39367 diff changeset	5043 else
5b9692f6629f __hash__ may now return long int; the final hash Martin v. Löwis <martin@v.loewis.de> parents: 39367 diff changeset	5044 h = PyInt_AsLong(res);
26559 0dbf98ee118e slot_tp_hash(): In the normal path, this leaked a reference to the Tim Peters <tim.peters@gmail.com> parents: 26448 diff changeset	5045 Py_DECREF(res);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5046 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5047 else {
44365 8dead6f81bae Fix refleak introduced in r59576. Georg Brandl <georg@python.org> parents: 44357 diff changeset	5048 Py_XDECREF(func); /* may be None */
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5049 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	5050 func = lookup_method(self, "__eq__", &eq_str);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5051 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5052 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	5053 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	5054 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5055 if (func != NULL) {
38871 a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	5056 PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'",
a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	5057 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	5058 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5059 return -1;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5060 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5061 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5062 h = _Py_HashPointer((void *)self);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5063 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5064 if (h == -1 && !PyErr_Occurred())
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5065 h = -2;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5066 return h;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5067 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5068
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5069 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5070 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	5071 {
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	5072 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	5073 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	5074 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5075
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5076 if (meth == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5077 return NULL;
38904 506c76847ec7 Fix for an obscure bug introduced by revs 46806 and 46808, with a test. Armin Rigo <arigo@tunes.org> parents: 38871 diff changeset	5078
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5079 res = PyObject_Call(meth, args, kwds);
38904 506c76847ec7 Fix for an obscure bug introduced by revs 46806 and 46808, with a test. Armin Rigo <arigo@tunes.org> parents: 38871 diff changeset	5080
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5081 Py_DECREF(meth);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5082 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5083 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5084
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	5085 /* 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	5086
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	5087 - 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	5088 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	5089
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	5090 - 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	5091
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5092 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	5093 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	5094 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	5095
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5096 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5097 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	5098 {
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	5099 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	5100 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	5101 "(O)", name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5102 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5103
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5104 static PyObject *
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5105 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	5106 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5107 PyTypeObject *tp = Py_TYPE(self);
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5108 PyObject getattr, getattribute, *res;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5109 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	5110 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	5111
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5112 if (getattr_str == NULL) {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5113 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	5114 if (getattr_str == NULL)
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5115 return NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5116 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5117 if (getattribute_str == NULL) {
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5118 getattribute_str =
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5119 PyString_InternFromString("__getattribute__");
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5120 if (getattribute_str == NULL)
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5121 return NULL;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5122 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5123 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	5124 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	5125 /* 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	5126 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	5127 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	5128 }
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5129 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	5130 if (getattribute == NULL \|\|
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5131 (Py_TYPE(getattribute) == &PyWrapperDescr_Type &&
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	5132 ((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	5133 (void *)PyObject_GenericGetAttr))
20028 df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5134 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	5135 else
38314 1fdf29a88f0e Replace PyObject_CallFunction calls with only object args Georg Brandl <georg@python.org> parents: 37880 diff changeset	5136 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	5137 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	5138 PyErr_Clear();
38314 1fdf29a88f0e Replace PyObject_CallFunction calls with only object args Georg Brandl <georg@python.org> parents: 37880 diff changeset	5139 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	5140 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5141 return res;
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5142 }
df1b83fd0ebb Add the __getattr__ hook back. The rules are now: Guido van Rossum <guido@python.org> parents: 20021 diff changeset	5143
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5144 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5145 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	5146 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5147 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	5148 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	5149
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5150 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	5151 res = call_method(self, "__delattr__", &delattr_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	5152 "(O)", name);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5153 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	5154 res = call_method(self, "__setattr__", &setattr_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	5155 "(OO)", name, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5156 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5157 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5158 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5159 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5160 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5161
44357 174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5162 static char *name_op[] = {
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5163 "__lt__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5164 "__le__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5165 "__eq__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5166 "__ne__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5167 "__gt__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5168 "__ge__",
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5169 };
174e0bcb2c3c Patch #1549 by Thomas Herve. Guido van Rossum <guido@python.org> parents: 44350 diff changeset	5170
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5171 static PyObject *
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5172 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	5173 {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5174 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	5175 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	5176
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	5177 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	5178 if (func == NULL) {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5179 PyErr_Clear();
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5180 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	5181 return Py_NotImplemented;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5182 }
30683 3b59fa5d25b1 Simplify and speedup uses of Py_BuildValue(): Raymond Hettinger <python@rcn.com> parents: 30671 diff changeset	5183 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	5184 if (args == NULL)
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5185 res = NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5186 else {
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	5187 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	5188 Py_DECREF(args);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5189 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5190 Py_DECREF(func);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5191 return res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5192 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5193
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5194 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5195 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	5196 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5197 PyObject *res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5198
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5199 if (Py_TYPE(self)->tp_richcompare == slot_tp_richcompare) {
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5200 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	5201 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	5202 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5203 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5204 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5205 if (Py_TYPE(other)->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	5206 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	5207 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	5208 return res;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5209 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5210 Py_DECREF(res);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5211 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5212 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	5213 return Py_NotImplemented;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5214 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5215
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5216 static PyObject *
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5217 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	5218 {
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5219 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	5220 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	5221
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	5222 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	5223 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	5224 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	5225 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	5226 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	5227 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	5228 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	5229 }
255d1d3e66a3 Squash a few calls to the hideously expensive PyObject_CallObject(o,a) Guido van Rossum <guido@python.org> parents: 24862 diff changeset	5230 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	5231 return res;
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5232 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5233 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	5234 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	5235 if (func == NULL) {
38871 a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	5236 PyErr_Format(PyExc_TypeError,
a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	5237 "'%.200s' object is not iterable",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5238 Py_TYPE(self)->tp_name);
19289 5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5239 return NULL;
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5240 }
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5241 Py_DECREF(func);
5c2bf6cde123 - Another big step in the right direction. All the overridable Guido van Rossum <guido@python.org> parents: 19253 diff changeset	5242 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	5243 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5244
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5245 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5246 slot_tp_iternext(PyObject *self)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5247 {
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	5248 static PyObject *next_str;
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	5249 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	5250 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5251
19339 6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	5252 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	5253 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	5254 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5255 PyTypeObject *tp = Py_TYPE(self);
19339 6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	5256 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	5257 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	5258
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	5259 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	5260 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	5261 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	5262 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	5263 }
6130deeb4cc6 type_new(): look for __dynamic__ at the module level (after looking in Guido van Rossum <guido@python.org> parents: 19329 diff changeset	5264 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	5265 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	5266 /* 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	5267 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	5268 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	5269 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	5270 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	5271 }
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	5272 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	5273 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	5274 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	5275 type = Py_None;
38314 1fdf29a88f0e Replace PyObject_CallFunction calls with only object args Georg Brandl <georg@python.org> parents: 37880 diff changeset	5276 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	5277 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5278
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5279 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5280 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	5281 {
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	5282 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	5283 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	5284
45d0e114212e slot_tp_descr_get(): guard against NULL obj or type (bug reported by Guido van Rossum <guido@python.org> parents: 19429 diff changeset	5285 if (value == NULL)
21142 842b280421ba Fix for SF bug #485678. Guido van Rossum <guido@python.org> parents: 20978 diff changeset	5286 res = call_method(self, "__delete__", &del_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	5287 "(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	5288 else
19538 b4a3fc147929 Finish the previous checkin: also avoid getattr when calling the method Guido van Rossum <guido@python.org> parents: 19535 diff changeset	5289 res = call_method(self, "__set__", &set_str,
19911 cba449ab5915 call_method(): Guido van Rossum <guido@python.org> parents: 19898 diff changeset	5290 "(OO)", target, value);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5291 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5292 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5293 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5294 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5295 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5296
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5297 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5298 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	5299 {
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	5300 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	5301 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	5302 PyObject *res;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5303
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5304 if (meth == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5305 return -1;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5306 res = PyObject_Call(meth, args, kwds);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5307 Py_DECREF(meth);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5308 if (res == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5309 return -1;
34668 9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	5310 if (res != Py_None) {
38871 a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	5311 PyErr_Format(PyExc_TypeError,
a3c61c648fc8 Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. Georg Brandl <georg@python.org> parents: 38314 diff changeset	5312 "__init__() should return None, not '%.200s'",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5313 Py_TYPE(res)->tp_name);
34668 9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	5314 Py_DECREF(res);
9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	5315 return -1;
9b3a2c4302aa SF bug #1155938: Missing None check for __init__(). Raymond Hettinger <python@rcn.com> parents: 33541 diff changeset	5316 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5317 Py_DECREF(res);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5318 return 0;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5319 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5320
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5321 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5322 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	5323 {
24680 6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	5324 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	5325 PyObject *func;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5326 PyObject newargs, x;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5327 Py_ssize_t i, n;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5328
24680 6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	5329 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	5330 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	5331 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	5332 return NULL;
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	5333 }
6d26d4b9c5a3 Significant speedup in new-style object creation: in slot_tp_new(), Guido van Rossum <guido@python.org> parents: 24678 diff changeset	5334 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	5335 if (func == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5336 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5337 assert(PyTuple_Check(args));
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5338 n = PyTuple_GET_SIZE(args);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5339 newargs = PyTuple_New(n+1);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5340 if (newargs == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5341 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5342 Py_INCREF(type);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5343 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	5344 for (i = 0; i < n; i++) {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5345 x = PyTuple_GET_ITEM(args, i);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5346 Py_INCREF(x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5347 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	5348 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5349 x = PyObject_Call(func, newargs, kwds);
20195 3408d929bb94 slot_tp_new(): newargs was leaking. Guido van Rossum <guido@python.org> parents: 20190 diff changeset	5350 Py_DECREF(newargs);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5351 Py_DECREF(func);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5352 return x;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5353 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5354
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5355 static void
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5356 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	5357 {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5358 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	5359 PyObject del, res;
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5360 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	5361
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5362 /* 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	5363 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	5364 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	5365
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5366 /* 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	5367 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	5368
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5369 /* 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	5370 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	5371 if (del != NULL) {
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5372 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	5373 if (res == NULL)
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5374 PyErr_WriteUnraisable(del);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5375 else
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5376 Py_DECREF(res);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5377 Py_DECREF(del);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5378 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5379
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5380 /* 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	5381 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	5382
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5383 /* 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	5384 * 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	5385 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5386 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	5387 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	5388 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	5389
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5390 /* __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	5391 * never happened.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5392 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5393 {
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	5394 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	5395 _Py_NewReference(self);
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5396 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	5397 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5398 assert(!PyType_IS_GC(Py_TYPE(self)) \|\|
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5399 _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	5400 /* 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	5401 * 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	5402 _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	5403 /* 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	5404 * 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	5405 * 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	5406 * _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	5407 * undone.
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5408 */
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5409 #ifdef COUNT_ALLOCS
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5410 --Py_TYPE(self)->tp_frees;
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5411 --Py_TYPE(self)->tp_allocs;
24678 71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5412 #endif
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5413 }
71dca7c76fa2 A modest speedup of object deallocation. call_finalizer() did rather Guido van Rossum <guido@python.org> parents: 24653 diff changeset	5414
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5415
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5416 /* 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	5417 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	5418 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	5419 sequences and mappings.
7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5420 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	5421 __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	5422 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	5423 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	5424 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	5425
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5426 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	5427
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5428 #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	5429 #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	5430 #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	5431 #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	5432 #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	5433 #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	5434 #undef UNSLOT
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5435 #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	5436 #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	5437 #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	5438
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5439 #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	5440 {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	5441 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	5442 #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	5443 {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	5444 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	5445 #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	5446 {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	5447 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	5448 #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	5449 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	5450 #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	5451 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	5452 #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	5453 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	5454 #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	5455 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	5456 "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	5457 #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	5458 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	5459 "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	5460 #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	5461 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	5462 "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	5463 #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	5464 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	5465 "x." NAME "(y) <==> y" DOC "x")
35004 8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5466 #define BINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5467 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_l, \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5468 "x." NAME "(y) <==> " DOC)
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5469 #define RBINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5470 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_r, \
8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5471 "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	5472
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5473 static slotdef slotdefs[] = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5474 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	5475 "x.__len__() <==> len(x)"),
36150 2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	5476 /* Heap types defining __add__/__mul__ have sq_concat/sq_repeat == NULL.
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	5477 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	5478 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	5479 user-defined methods has unexpected side-effects, as shown by
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	5480 test_descr.notimplemented() */
2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	5481 SQSLOT("__add__", sq_concat, NULL, wrap_binaryfunc,
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5482 "x.__add__(y) <==> x+y"),
37308 aaa04bfafc58 Minor bugs in the __index__ code (PEP 357), with tests. Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	5483 SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc,
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5484 "x.__mul__(n) <==> x*n"),
37308 aaa04bfafc58 Minor bugs in the __index__ code (PEP 357), with tests. Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	5485 SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc,
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5486 "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	5487 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	5488 "x.__getitem__(y) <==> x[y]"),
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5489 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	5490 "x.__getslice__(i, j) <==> x[i:j]\n\
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5491 \n\
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5492 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	5493 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	5494 "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	5495 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	5496 "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	5497 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	5498 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	5499 "x.__setslice__(i, j, y) <==> x[i:j]=y\n\
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5500 \n\
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5501 Use of negative indices is not supported."),
29173 421ffd7c57af Fixing the previous patch to have the changes be to the proper docstrings. Brett Cannon <bcannon@gmail.com> parents: 29172 diff changeset	5502 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	5503 "x.__delslice__(i, j) <==> del x[i:j]\n\
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5504 \n\
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5505 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	5506 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	5507 "x.__contains__(y) <==> y in x"),
36150 2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	5508 SQSLOT("__iadd__", sq_inplace_concat, NULL,
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5509 wrap_binaryfunc, "x.__iadd__(y) <==> x+=y"),
36150 2eb78f5d1450 SF patch #1390657: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	5510 SQSLOT("__imul__", sq_inplace_repeat, NULL,
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5511 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	5512
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5513 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	5514 "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	5515 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	5516 wrap_binaryfunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5517 "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	5518 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	5519 wrap_objobjargproc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5520 "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	5521 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	5522 wrap_delitem,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5523 "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	5524
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5525 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	5526 "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5527 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	5528 "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5529 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	5530 "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5531 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	5532 "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5533 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	5534 "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5535 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	5536 "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5537 BINSLOT("__div__", nb_divide, slot_nb_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5538 "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5539 RBINSLOT("__rdiv__", nb_divide, slot_nb_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5540 "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5541 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	5542 "%"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5543 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	5544 "%"),
35004 8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5545 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	5546 "divmod(x, y)"),
35004 8880d91cdb09 fix object.__divmod__.__doc__ Anthony Baxter <anthonybaxter@gmail.com> parents: 34958 diff changeset	5547 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	5548 "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	5549 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	5550 "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	5551 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	5552 "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	5553 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	5554 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	5555 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	5556 "abs(x)"),
30670 7f6134f8bd06 SF bug #820397: __nonzero__() returns 1/0 Raymond Hettinger <python@rcn.com> parents: 30660 diff changeset	5557 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	5558 "x != 0"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5559 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	5560 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	5561 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	5562 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	5563 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	5564 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	5565 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	5566 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	5567 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	5568 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	5569 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	5570 NBSLOT("__coerce__", nb_coerce, slot_nb_coerce, wrap_coercefunc,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5571 "x.__coerce__(y) <==> coerce(x, y)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5572 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	5573 "int(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5574 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	5575 "long(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5576 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	5577 "float(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5578 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	5579 "oct(x)"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5580 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	5581 "hex(x)"),
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39415 diff changeset	5582 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	5583 "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	5584 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	5585 wrap_binaryfunc, "+"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5586 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	5587 wrap_binaryfunc, "-"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5588 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	5589 wrap_binaryfunc, "*"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5590 IBSLOT("__idiv__", nb_inplace_divide, slot_nb_inplace_divide,
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5591 wrap_binaryfunc, "/"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5592 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	5593 wrap_binaryfunc, "%"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5594 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	5595 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	5596 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	5597 wrap_binaryfunc, "<<"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5598 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	5599 wrap_binaryfunc, ">>"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5600 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	5601 wrap_binaryfunc, "&"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5602 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	5603 wrap_binaryfunc, "^"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5604 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	5605 wrap_binaryfunc, "\|"),
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5606 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	5607 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	5608 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	5609 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	5610 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	5611 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	5612 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	5613 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	5614
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5615 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	5616 "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	5617 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	5618 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	5619 "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	5620 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	5621 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	5622 "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	5623 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	5624 "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	5625 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	5626 "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	5627 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	5628 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	5629 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	5630 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	5631 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	5632 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	5633 "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	5634 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	5635 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	5636 "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	5637 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	5638 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	5639 "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	5640 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	5641 "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	5642 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	5643 "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	5644 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	5645 "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	5646 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	5647 "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	5648 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	5649 "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	5650 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	5651 "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	5652 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	5653 "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	5654 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	5655 "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	5656 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	5657 "descr.__set__(obj, value)"),
24460 2d77be41ee5f SF patch 588728 (Nathan Srebro). Guido van Rossum <guido@python.org> parents: 24427 diff changeset	5658 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	5659 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	5660 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	5661 "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	5662 "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	5663 PyWrapperFlag_KEYWORDS),
ff57a1a370b3 Methods of built-in types now properly check for keyword arguments Guido van Rossum <guido@python.org> parents: 20595 diff changeset	5664 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	5665 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	5666 {NULL}
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5667 };
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5668
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5669 /* Given a type pointer and an offset gotten from a slotdef entry, return a
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5670 pointer to the actual slot. This is not quite the same as simply adding
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5671 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	5672 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	5673 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	5674 static void **
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5675 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	5676 {
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5677 char *ptr;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5678 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	5679
28219 7c8e8807aed2 - The extended type structure used for heap types (new-style Guido van Rossum <guido@python.org> parents: 28016 diff changeset	5680 /* 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	5681 assert(offset >= 0);
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37759 diff changeset	5682 assert((size_t)offset < offsetof(PyHeapTypeObject, as_buffer));
20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37759 diff changeset	5683 if ((size_t)offset >= offsetof(PyHeapTypeObject, as_sequence)) {
37603 38acb91824fc Correct casts to char. Martin v. Löwis <martin@v.loewis.de>* parents: 37596 diff changeset	5684 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	5685 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	5686 }
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37759 diff changeset	5687 else if ((size_t)offset >= offsetof(PyHeapTypeObject, as_mapping)) {
37603 38acb91824fc Correct casts to char. Martin v. Löwis <martin@v.loewis.de>* parents: 37596 diff changeset	5688 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	5689 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	5690 }
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37759 diff changeset	5691 else if ((size_t)offset >= offsetof(PyHeapTypeObject, as_number)) {
37603 38acb91824fc Correct casts to char. Martin v. Löwis <martin@v.loewis.de>* parents: 37596 diff changeset	5692 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	5693 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	5694 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5695 else {
37603 38acb91824fc Correct casts to char. Martin v. Löwis <martin@v.loewis.de>* parents: 37596 diff changeset	5696 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	5697 }
7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5698 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	5699 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	5700 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	5701 }
19036 3a7d67ee1011 Cosmetics: Guido van Rossum <guido@python.org> parents: 19011 diff changeset	5702
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5703 /* 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	5704 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	5705 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	5706 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	5707 #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	5708
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5709 /* 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	5710 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	5711 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	5712 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	5713 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5714 /* 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	5715
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5716 /* 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	5717 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	5718 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	5719 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	5720 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	5721
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5722 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	5723 /* 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	5724 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	5725 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	5726 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	5727 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	5728 *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	5729 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5730 *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	5731 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5732
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5733 /* Look in all matching slots of the type; if exactly one of these has
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5734 a filled-in slot, return its value. Otherwise return NULL. */
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5735 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	5736 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	5737 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	5738 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	5739 continue;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5740 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	5741 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	5742 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	5743 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5744 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	5745 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5746
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5747 /* 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	5748 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	5749 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	5750 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	5751 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	5752 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	5753 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	5754 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	5755 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5756 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	5757 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	5758 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	5759 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	5760 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	5761 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	5762
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5763 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	5764 do {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5765 ++p;
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5766 } 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	5767 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	5768 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5769 do {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5770 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	5771 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	5772 continue;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5773 if (Py_TYPE(descr) == &PyWrapperDescr_Type) {
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5774 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	5775 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	5776 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	5777 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	5778 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	5779 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	5780 {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5781 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	5782 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	5783 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	5784 else
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5785 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	5786 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5787 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	5788 else if (Py_TYPE(descr) == &PyCFunction_Type &&
24685 36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5789 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	5790 (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	5791 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	5792 {
36493a7c6253 Major speedup for new-style class creation. Turns out there was some Guido van Rossum <guido@python.org> parents: 24680 diff changeset	5793 /* 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	5794 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	5795 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	5796 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	5797 __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	5798 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	5799 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	5800 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	5801 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	5802 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	5803 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	5804 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	5805 /* 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	5806 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	5807 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	5808 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	5809 }
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5810 else {
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5811 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	5812 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	5813 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5814 } 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	5815 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	5816 *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	5817 else
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5818 *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	5819 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	5820 }
0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5821
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5822 /* 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	5823 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	5824 static int
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5825 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	5826 {
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5827 slotdef pp = (slotdef )data;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5828
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5829 for (; *pp; pp++)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5830 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	5831 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	5832 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5833
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5834 /* 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	5835 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	5836 static int
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5837 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	5838 {
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5839 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	5840 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	5841 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	5842 return c;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5843 else
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5844 /* 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	5845 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	5846 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	5847 }
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5848
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5849 /* 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	5850 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	5851 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	5852 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	5853 {
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5854 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	5855 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	5856
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5857 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	5858 return;
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5859 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	5860 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	5861 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	5862 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	5863 }
20457 4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5864 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	5865 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	5866 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	5867 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5868
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5869 /* 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	5870 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	5871 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	5872 {
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5873 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	5874 slotdef *p;
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5875 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	5876 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	5877
44664 387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	5878 /* Clear the VALID_VERSION flag of 'type' and all its
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	5879 subclasses. This could possibly be unified with the
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	5880 update_subclasses() recursion below, but carefully:
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	5881 they each have their own conditions on which to stop
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	5882 recursing into subclasses. */
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	5883 type_modified(type);
387d48c3a0b3 Re-apply patch #1700288 (first applied in r59931, rolled back in r59940) Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44661 diff changeset	5884
20457 4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5885 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	5886 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	5887 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	5888 /* 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	5889 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	5890 *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	5891 }
4f71dcfd0a93 Refactored the update_slot() code a bit to be hopefully slightly more Guido van Rossum <guido@python.org> parents: 20445 diff changeset	5892 *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	5893 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	5894 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	5895 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	5896 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	5897 --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	5898 *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	5899 }
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5900 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	5901 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	5902 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	5903 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	5904 }
be08734b0afd Another step in the right direction: when a new class's attribute Guido van Rossum <guido@python.org> parents: 20345 diff changeset	5905
22834 0908729e94e0 A much revised version of SF patch 514662, by Naofumi Honda. This Guido van Rossum <guido@python.org> parents: 22804 diff changeset	5906 /* 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	5907 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	5908 dict. */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5909 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	5910 fixup_slot_dispatchers(PyTypeObject *type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18068 diff changeset	5911 {
20343 7bd12270dc3e Halfway checkin. This is still messy, but it's beginning to address Guido van Rossum <guido@python.org> parents: 20328 diff changeset	5912 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	5913
4698a3ec5fa8 Redid the slot computation. The initial slot assignments are now done Guido van Rossum <guido@python.org> parents: 20386 diff changeset	5914 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	5915 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	5916 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	5917 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	5918
26421 9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5919 static void
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5920 update_all_slots(PyTypeObject* type)
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5921 {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5922 slotdef *p;
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5923
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5924 init_slotdefs();
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5925 for (p = slotdefs; p->name; p++) {
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5926 /* update_slot returns int but can't actually fail */
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5927 update_slot(type, p->name_strobj);
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5928 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5929 }
9d6aed2e60e2 This is my patch: Michael W. Hudson <mwh@python.net> parents: 26410 diff changeset	5930
28403 63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5931 /* 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	5932 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	5933 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	5934
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5935 static int
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5936 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	5937 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	5938 {
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5939 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	5940 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5941 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	5942 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5943
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5944 static int
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5945 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	5946 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	5947 {
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5948 PyTypeObject *subclass;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5949 PyObject ref, subclasses, *dict;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	5950 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	5951
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5952 subclasses = type->tp_subclasses;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5953 if (subclasses == NULL)
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5954 return 0;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5955 assert(PyList_Check(subclasses));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5956 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	5957 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	5958 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	5959 assert(PyWeakref_CheckRef(ref));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5960 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	5961 assert(subclass != NULL);
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5962 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	5963 continue;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5964 assert(PyType_Check(subclass));
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5965 /* 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	5966 dict = subclass->tp_dict;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5967 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	5968 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	5969 continue;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5970 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	5971 return -1;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5972 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5973 return 0;
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5974 }
63ed85290413 Refactoring: rename update_these_slots() into update_subclasses() and Guido van Rossum <guido@python.org> parents: 28396 diff changeset	5975
20586 9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	5976 /* 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	5977 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	5978 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	5979 corresponding descriptors are added in the type's tp_dict dictionary
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5980 under the appropriate name (like __repr__). Some function slots
23830 ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5981 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	5982 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	5983 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	5984 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	5985
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	5986 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	5987 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	5988 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	5989 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	5990 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	5991 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	5992 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	5993 wins.
23830 ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5994
ade1d56109a8 Hopefully this addresses the remaining issues of SF bugs 459235 and Guido van Rossum <guido@python.org> parents: 23756 diff changeset	5995 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	5996 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	5997 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	5998 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	5999 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	6000 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	6001 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	6002 (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	6003 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	6004 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	6005
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6006 static int
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6007 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	6008 {
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6009 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	6010 slotdef *p;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6011 PyObject *descr;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6012 void **ptr;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6013
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6014 init_slotdefs();
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6015 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	6016 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	6017 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6018 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	6019 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	6020 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6021 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	6022 continue;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6023 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	6024 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	6025 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6026 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	6027 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6028 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	6029 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6030 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	6031 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	6032 return -1;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6033 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6034 return 0;
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6035 }
9bd603d434f5 Big internal change that should have no external effects: unify the Guido van Rossum <guido@python.org> parents: 20516 diff changeset	6036
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6037
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6038 /* Cooperative 'super' */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6039
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6040 typedef struct {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6041 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	6042 PyTypeObject *type;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6043 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	6044 PyTypeObject *obj_type;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6045 } superobject;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6046
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	6047 static PyMemberDef super_members[] = {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	6048 {"__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	6049 "the class invoking super()"},
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19970 diff changeset	6050 {"__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	6051 "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	6052 {"__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	6053 "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	6054 {0}
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6055 };
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6056
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6057 static void
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6058 super_dealloc(PyObject *self)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6059 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6060 superobject su = (superobject )self;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6061
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	6062 _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	6063 Py_XDECREF(su->obj);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6064 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	6065 Py_XDECREF(su->obj_type);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6066 Py_TYPE(self)->tp_free(self);
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6067 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6068
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6069 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	6070 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	6071 {
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6072 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	6073
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6074 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	6075 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	6076 "<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	6077 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	6078 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	6079 else
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6080 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	6081 "<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	6082 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	6083 }
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6084
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6085 static PyObject *
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6086 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	6087 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6088 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	6089 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	6090
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	6091 if (!skip) {
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	6092 /* 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	6093 (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	6094 skip = (PyString_Check(name) &&
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	6095 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	6096 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	6097 }
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	6098
9be4103807f5 - super() no longer ignores data descriptors, except __class__. See Guido van Rossum <guido@python.org> parents: 28625 diff changeset	6099 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	6100 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	6101 PyTypeObject *starttype;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6102 descrgetfunc f;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36169 diff changeset	6103 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	6104
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6105 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	6106 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	6107
19630 ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6108 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	6109 n = 0;
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6110 else {
ae056f114974 Give 'super' a decent repr(), and readonly attributes to access the Guido van Rossum <guido@python.org> parents: 19618 diff changeset	6111 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	6112 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	6113 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6114 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	6115 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	6116 break;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6117 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6118 i++;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6119 res = NULL;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6120 for (; i < n; i++) {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6121 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	6122 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	6123 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	6124 else if (PyClass_Check(tmp))
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	6125 dict = ((PyClassObject *)tmp)->cl_dict;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	6126 else
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	6127 continue;
44f3f5a5bfe2 Changing diapers reminded Guido that he wanted to allow for some measure Tim Peters <tim.peters@gmail.com> parents: 20754 diff changeset	6128 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	6129 if (res != NULL) {
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6130 Py_INCREF(res);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6131 f = Py_TYPE(res)->tp_descr_get;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6132 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	6133 tmp = f(res,
37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	6134 /* 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	6135 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	6136 (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	6137 */
31813 8184c677713f Get rid of gcc warning. Hye-Shik Chang <hyeshik@gmail.com> parents: 31800 diff changeset	6138 (su->obj == (PyObject *)
8184c677713f Get rid of gcc warning. Hye-Shik Chang <hyeshik@gmail.com> parents: 31800 diff changeset	6139 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	6140 ? (PyObject *)NULL
37dc8c80ca7e Ensure super() lookup of descriptor from classmethod works (SF #743627) Phillip J. Eby <pje@telecommunity.com> parents: 31477 diff changeset	6141 : su->obj),
22774 02fddf7c25c2 Fold some long lines. Delete blank initial line. Guido van Rossum <guido@python.org> parents: 22770 diff changeset	6142 (PyObject *)starttype);
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6143 Py_DECREF(res);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6144 res = tmp;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6145 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6146 return res;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6147 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6148 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6149 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6150 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	6151 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6152
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6153 static PyTypeObject *
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6154 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	6155 {
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6156 /* 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	6157
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6158 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	6159
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6160 - If it is a class, it must be a subclass of 'type'. This case is
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6161 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	6162
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6163 - 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	6164 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	6165
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6166 But... when obj is an instance, we want to allow for the case where
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6167 Py_TYPE(obj) is not a subclass of type, but obj.__class__ is!
27831 6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6168 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	6169 */
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6170
27942 9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	6171 /* 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	6172 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	6173 Py_INCREF(obj);
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	6174 return (PyTypeObject *)obj;
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	6175 }
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	6176
9255fbde43f3 The recent changes to super(), in particular supercheck(), broke when Guido van Rossum <guido@python.org> parents: 27866 diff changeset	6177 /* Normal case */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6178 if (PyType_IsSubtype(Py_TYPE(obj), type)) {
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6179 Py_INCREF(Py_TYPE(obj));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6180 return Py_TYPE(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	6181 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6182 else {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6183 /* 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	6184 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	6185 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	6186
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6187 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	6188 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	6189 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	6190 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	6191 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6192
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6193 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	6194
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6195 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	6196 PyType_Check(class_attr) &&
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6197 (PyTypeObject *)class_attr != Py_TYPE(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	6198 {
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6199 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	6200 (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	6201 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	6202 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	6203 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6204
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6205 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	6206 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	6207 else
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6208 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	6209 }
6b5696541ba4 Implement another useful feature for proxies: in super(X, x), x may Guido van Rossum <guido@python.org> parents: 27821 diff changeset	6210
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6211 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	6212 "super(type, obj): "
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6213 "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	6214 return NULL;
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6215 }
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6216
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6217 static PyObject *
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6218 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	6219 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6220 superobject su = (superobject )self;
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	6221 superobject *newobj;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6222
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6223 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	6224 /* 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	6225 Py_INCREF(self);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6226 return self;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6227 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6228 if (Py_TYPE(su) != &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	6229 /* 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	6230 call its type */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43958 diff changeset	6231 return PyObject_CallFunctionObjArgs((PyObject *)Py_TYPE(su),
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6232 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	6233 else {
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6234 /* 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	6235 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	6236 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	6237 return NULL;
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	6238 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	6239 NULL, NULL);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	6240 if (newobj == NULL)
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6241 return NULL;
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6242 Py_INCREF(su->type);
918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6243 Py_INCREF(obj);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	6244 newobj->type = su->type;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	6245 newobj->obj = obj;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	6246 newobj->obj_type = obj_type;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37308 diff changeset	6247 return (PyObject *)newobj;
21151 918b57354d87 Address SF patch #480716 as well as related issues. Guido van Rossum <guido@python.org> parents: 21142 diff changeset	6248 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6249 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6250
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6251 static int
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6252 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	6253 {
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6254 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	6255 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	6256 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	6257 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	6258
39921 49fbddfb1217 Patch #1567691: super() and new.instancemethod() now don't accept Georg Brandl <georg@python.org> parents: 39464 diff changeset	6259 if (!_PyArg_NoKeywords("super", kwds))
49fbddfb1217 Patch #1567691: super() and new.instancemethod() now don't accept Georg Brandl <georg@python.org> parents: 39464 diff changeset	6260 return -1;
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6261 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	6262 return -1;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6263 if (obj == Py_None)
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6264 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	6265 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	6266 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	6267 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	6268 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	6269 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	6270 }
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6271 Py_INCREF(type);
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6272 su->type = type;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6273 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	6274 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	6275 return 0;
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6276 }
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6277
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23830 diff changeset	6278 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	6279 "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	6280 "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	6281 "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	6282 "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	6283 "class C(B):\n"
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6284 " def meth(self, arg):\n"
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6285 " 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	6286
20220 0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	6287 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	6288 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	6289 {
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	6290 superobject su = (superobject )self;
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	6291
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	6292 Py_VISIT(su->obj);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	6293 Py_VISIT(su->type);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	6294 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	6295
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	6296 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	6297 }
0b99174d6b17 Add Garbage Collection support to new-style classes (not yet to their Guido van Rossum <guido@python.org> parents: 20204 diff changeset	6298
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6299 PyTypeObject PySuper_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41816 diff changeset	6300 PyVarObject_HEAD_INIT(&PyType_Type, 0)
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6301 "super", /* tp_name */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6302 sizeof(superobject), /* tp_basicsize */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6303 0, /* tp_itemsize */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6304 /* methods */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6305 super_dealloc, /* tp_dealloc */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6306 0, /* tp_print */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6307 0, /* tp_getattr */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6308 0, /* tp_setattr */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6309 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	6310 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	6311 0, /* tp_as_number */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6312 0, /* tp_as_sequence */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6313 0, /* tp_as_mapping */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6314 0, /* tp_hash */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6315 0, /* tp_call */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6316 0, /* tp_str */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6317 super_getattro, /* tp_getattro */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6318 0, /* tp_setattro */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6319 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	6320 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	6321 Py_TPFLAGS_BASETYPE, /* tp_flags */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6322 super_doc, /* tp_doc */
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6323 super_traverse, /* tp_traverse */
3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6324 0, /* tp_clear */
19469 b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6325 0, /* tp_richcompare */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6326 0, /* tp_weaklistoffset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6327 0, /* tp_iter */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6328 0, /* tp_iternext */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6329 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	6330 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	6331 0, /* tp_getset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6332 0, /* tp_base */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6333 0, /* tp_dict */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6334 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	6335 0, /* tp_descr_set */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6336 0, /* tp_dictoffset */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6337 super_init, /* tp_init */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6338 PyType_GenericAlloc, /* tp_alloc */
b3c92f013869 Add 'super', another new object type with magical properties. Guido van Rossum <guido@python.org> parents: 19464 diff changeset	6339 PyType_GenericNew, /* tp_new */
40974 3cabbfa43984 whitespace normalization Jeremy Hylton <jeremy@alum.mit.edu> parents: 40908 diff changeset	6340 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	6341 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/typeobject.c @ 44685:e511ccf2ffbe legacy-trunk