Mercurial > cpython-lru_cache-weakref
annotate Objects/typeobject.c @ 58765:2ba7677bfa95 legacy-trunk
testCopysign was defined twice in test_math; combine the definitions
| author | Mark Dickinson <dickinsm@gmail.com> |
|---|---|
| date | Sat, 06 Feb 2010 23:11:25 +0000 |
| parents | c2e4cfbb398c |
| children | 20497d85e011 |
| rev | line source |
|---|---|
| 6 | 1 /* Type object implementation */ |
| 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 | 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, \ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
22 ((PyStringObject *)(name))->ob_shash) |
|
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
|
23 #define MCACHE_CACHEABLE_NAME(name) \ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
24 PyString_CheckExact(name) && \ |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
25 PyString_GET_SIZE(name) <= MCACHE_MAX_ATTR_SIZE |
|
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
|
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; |
|
45025
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
35 |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
36 unsigned int |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
37 PyType_ClearCache(void) |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
38 { |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
39 Py_ssize_t i; |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
40 unsigned int cur_version_tag = next_version_tag - 1; |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
41 |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
42 for (i = 0; i < (1 << MCACHE_SIZE_EXP); i++) { |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
43 method_cache[i].version = 0; |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
44 Py_CLEAR(method_cache[i].name); |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
45 method_cache[i].value = NULL; |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
46 } |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
47 next_version_tag = 0; |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
48 /* mark all version tags as invalid */ |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
49 PyType_Modified(&PyBaseObject_Type); |
|
45025
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
50 return cur_version_tag; |
|
ea3fe302d392
Added clear cache methods to clear the internal type lookup cache for ref leak test runs.
Christian Heimes <christian@cheimes.de>
parents:
45004
diff
changeset
|
51 } |
|
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
|
52 |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
53 void |
|
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
54 PyType_Modified(PyTypeObject *type) |
|
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
|
55 { |
|
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 /* 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
|
57 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
|
58 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
|
59 |
|
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 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
|
61 |
|
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 - 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
|
63 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
|
64 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
|
65 |
|
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 - 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
|
67 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
|
68 |
|
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 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
|
70 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
|
71 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
|
72 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
|
73 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
|
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 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
|
76 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
|
77 |
| 45004 | 78 if (!PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) |
|
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
|
79 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
|
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 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
|
82 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
|
83 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
|
84 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
|
85 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
|
86 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
|
87 if (ref != Py_None) { |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
88 PyType_Modified((PyTypeObject *)ref); |
|
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
|
89 } |
|
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 } |
|
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 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
|
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 |
|
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 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
|
96 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
|
97 /* |
|
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 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
|
99 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
|
100 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
|
101 |
|
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 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
|
103 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
|
104 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
|
105 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
|
106 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
|
107 |
|
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 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
|
109 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
|
110 */ |
|
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 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
|
112 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
|
113 |
| 45004 | 114 if (!PyType_HasFeature(type, Py_TPFLAGS_HAVE_VERSION_TAG)) |
|
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
|
115 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
|
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 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
|
118 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
|
119 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
|
120 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
|
121 |
|
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 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
|
123 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
|
124 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
|
125 } |
|
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 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
|
128 |
|
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 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
|
130 !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
|
131 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
|
132 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
|
133 } |
|
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 |
|
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 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
|
137 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
|
138 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
|
139 } |
|
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 |
|
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 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
|
142 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
|
143 { |
|
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 /* 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
|
145 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
|
146 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
|
147 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
|
148 */ |
|
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 Py_ssize_t i, n; |
|
47371
e81d02d09697
Revert #2990 patch; it's not necessary as Armin showed.
Georg Brandl <georg@python.org>
parents:
47360
diff
changeset
|
150 PyObject *bases; |
|
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
|
151 |
|
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 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
|
153 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
|
154 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
|
155 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
|
156 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
|
157 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
|
158 |
|
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 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
|
160 /* 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
|
161 |
|
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 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
|
163 /* 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
|
164 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
|
165 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
|
166 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
|
167 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
|
168 method_cache[i].value = NULL; |
|
47371
e81d02d09697
Revert #2990 patch; it's not necessary as Armin showed.
Georg Brandl <georg@python.org>
parents:
47360
diff
changeset
|
169 Py_XDECREF(method_cache[i].name); |
|
e81d02d09697
Revert #2990 patch; it's not necessary as Armin showed.
Georg Brandl <georg@python.org>
parents:
47360
diff
changeset
|
170 method_cache[i].name = Py_None; |
|
47360
7ae79e96fc42
#2990: prevent inconsistent state while updating method cache.
Georg Brandl <georg@python.org>
parents:
47358
diff
changeset
|
171 Py_INCREF(Py_None); |
|
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
|
172 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
173 /* mark all version tags as invalid */ |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
174 PyType_Modified(&PyBaseObject_Type); |
|
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
|
175 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
|
176 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
177 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
|
178 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
|
179 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
|
180 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
|
181 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
|
182 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
|
183 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
|
184 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
185 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
|
186 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
|
187 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
188 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
189 |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
190 static PyMemberDef type_members[] = { |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
191 {"__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
|
192 {"__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
|
193 {"__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
|
194 {"__weakrefoffset__", T_LONG, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
195 offsetof(PyTypeObject, tp_weaklistoffset), READONLY}, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
196 {"__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
|
197 {"__dictoffset__", T_LONG, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
198 offsetof(PyTypeObject, tp_dictoffset), READONLY}, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
199 {"__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
|
200 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
201 }; |
| 6 | 202 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
203 static PyObject * |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
204 type_name(PyTypeObject *type, void *context) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
205 { |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35742
diff
changeset
|
206 const char *s; |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
207 |
|
26448
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
208 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
|
209 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
|
210 |
|
36631
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
211 Py_INCREF(et->ht_name); |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
212 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
|
213 } |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
214 else { |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
215 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
|
216 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
|
217 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
|
218 else |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
219 s++; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
220 return PyString_FromString(s); |
|
26448
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
221 } |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
222 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
223 |
| 26421 | 224 static int |
| 225 type_set_name(PyTypeObject *type, PyObject *value, void *context) | |
| 226 { | |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
227 PyHeapTypeObject* et; |
| 26421 | 228 |
| 229 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) { | |
| 230 PyErr_Format(PyExc_TypeError, | |
| 231 "can't set %s.__name__", type->tp_name); | |
| 232 return -1; | |
| 233 } | |
| 234 if (!value) { | |
| 235 PyErr_Format(PyExc_TypeError, | |
| 236 "can't delete %s.__name__", type->tp_name); | |
| 237 return -1; | |
| 238 } | |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
239 if (!PyString_Check(value)) { |
| 26421 | 240 PyErr_Format(PyExc_TypeError, |
| 241 "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
|
242 type->tp_name, Py_TYPE(value)->tp_name); |
| 26421 | 243 return -1; |
| 244 } | |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
245 if (strlen(PyString_AS_STRING(value)) |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
246 != (size_t)PyString_GET_SIZE(value)) { |
| 26421 | 247 PyErr_Format(PyExc_ValueError, |
| 248 "__name__ must not contain null bytes"); | |
| 249 return -1; | |
| 250 } | |
| 251 | |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
252 et = (PyHeapTypeObject*)type; |
| 26421 | 253 |
| 254 Py_INCREF(value); | |
| 255 | |
|
36631
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
256 Py_DECREF(et->ht_name); |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
257 et->ht_name = value; |
| 26421 | 258 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
259 type->tp_name = PyString_AS_STRING(value); |
| 26421 | 260 |
| 261 return 0; | |
| 262 } | |
| 263 | |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
264 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
265 type_module(PyTypeObject *type, void *context) |
|
2080
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
266 { |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
267 PyObject *mod; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
268 char *s; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
269 |
|
26448
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
270 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
|
271 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
|
272 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
|
273 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
|
274 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
|
275 } |
|
26448
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
276 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
|
277 return mod; |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
278 } |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
279 else { |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
280 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
|
281 if (s != NULL) |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
282 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
|
283 type->tp_name, (Py_ssize_t)(s - type->tp_name)); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
284 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
|
285 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
286 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
287 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
288 static int |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
289 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
|
290 { |
| 26421 | 291 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
|
292 PyErr_Format(PyExc_TypeError, |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
293 "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
|
294 return -1; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
295 } |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
296 if (!value) { |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
297 PyErr_Format(PyExc_TypeError, |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
298 "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
|
299 return -1; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
300 } |
| 26421 | 301 |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
302 PyType_Modified(type); |
|
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
|
303 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
304 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
|
305 } |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
306 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
307 static PyObject * |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
308 type_abstractmethods(PyTypeObject *type, void *context) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
309 { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
310 PyObject *mod = PyDict_GetItemString(type->tp_dict, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
311 "__abstractmethods__"); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
312 if (!mod) { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
313 PyErr_Format(PyExc_AttributeError, "__abstractmethods__"); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
314 return NULL; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
315 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
316 Py_XINCREF(mod); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
317 return mod; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
318 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
319 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
320 static int |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
321 type_set_abstractmethods(PyTypeObject *type, PyObject *value, void *context) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
322 { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
323 /* __abstractmethods__ should only be set once on a type, in |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
324 abc.ABCMeta.__new__, so this function doesn't do anything |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
325 special to update subclasses. |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
326 */ |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
327 int res = PyDict_SetItemString(type->tp_dict, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
328 "__abstractmethods__", value); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
329 if (res == 0) { |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
330 PyType_Modified(type); |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
331 if (value && PyObject_IsTrue(value)) { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
332 type->tp_flags |= Py_TPFLAGS_IS_ABSTRACT; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
333 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
334 else { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
335 type->tp_flags &= ~Py_TPFLAGS_IS_ABSTRACT; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
336 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
337 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
338 return res; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
339 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
340 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
341 static PyObject * |
| 26421 | 342 type_get_bases(PyTypeObject *type, void *context) |
| 343 { | |
| 344 Py_INCREF(type->tp_bases); | |
| 345 return type->tp_bases; | |
| 346 } | |
| 347 | |
| 348 static PyTypeObject *best_base(PyObject *); | |
| 349 static int mro_internal(PyTypeObject *); | |
| 350 static int compatible_for_assignment(PyTypeObject *, PyTypeObject *, char *); | |
| 351 static int add_subclass(PyTypeObject*, PyTypeObject*); | |
| 352 static void remove_subclass(PyTypeObject *, PyTypeObject *); | |
| 353 static void update_all_slots(PyTypeObject *); | |
| 354 | |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
355 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
|
356 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
|
357 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
|
358 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
|
359 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
|
360 |
| 26421 | 361 static int |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
362 mro_subclasses(PyTypeObject *type, PyObject* temp) |
| 26421 | 363 { |
| 364 PyTypeObject *subclass; | |
| 365 PyObject *ref, *subclasses, *old_mro; | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
366 Py_ssize_t i, n; |
| 26421 | 367 |
| 368 subclasses = type->tp_subclasses; | |
| 369 if (subclasses == NULL) | |
| 370 return 0; | |
| 371 assert(PyList_Check(subclasses)); | |
| 372 n = PyList_GET_SIZE(subclasses); | |
| 373 for (i = 0; i < n; i++) { | |
| 374 ref = PyList_GET_ITEM(subclasses, i); | |
| 375 assert(PyWeakref_CheckRef(ref)); | |
| 376 subclass = (PyTypeObject *)PyWeakref_GET_OBJECT(ref); | |
| 377 assert(subclass != NULL); | |
| 378 if ((PyObject *)subclass == Py_None) | |
| 379 continue; | |
| 380 assert(PyType_Check(subclass)); | |
| 381 old_mro = subclass->tp_mro; | |
| 382 if (mro_internal(subclass) < 0) { | |
| 383 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
|
384 return -1; |
| 26421 | 385 } |
| 386 else { | |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
387 PyObject* tuple; |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
388 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
|
389 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
|
390 if (!tuple) |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
391 return -1; |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
392 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
|
393 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
|
394 Py_DECREF(tuple); |
| 26421 | 395 } |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
396 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
|
397 return -1; |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
398 } |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
399 return 0; |
| 26421 | 400 } |
| 401 | |
| 402 static int | |
| 403 type_set_bases(PyTypeObject *type, PyObject *value, void *context) | |
| 404 { | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
405 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
406 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
|
407 PyObject *ob, *temp; |
| 41488 | 408 PyTypeObject *new_base, *old_base; |
| 26421 | 409 PyObject *old_bases, *old_mro; |
| 410 | |
| 411 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) { | |
| 412 PyErr_Format(PyExc_TypeError, | |
| 413 "can't set %s.__bases__", type->tp_name); | |
| 414 return -1; | |
| 415 } | |
| 416 if (!value) { | |
| 417 PyErr_Format(PyExc_TypeError, | |
| 418 "can't delete %s.__bases__", type->tp_name); | |
| 419 return -1; | |
| 420 } | |
| 421 if (!PyTuple_Check(value)) { | |
| 422 PyErr_Format(PyExc_TypeError, | |
| 423 "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
|
424 type->tp_name, Py_TYPE(value)->tp_name); |
| 26421 | 425 return -1; |
| 426 } | |
|
26645
d176cbfd3765
Tighten the tests for assignment to __bases__: disallow empty tuple.
Guido van Rossum <guido@python.org>
parents:
26583
diff
changeset
|
427 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
|
428 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
|
429 "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
|
430 type->tp_name); |
|
d176cbfd3765
Tighten the tests for assignment to __bases__: disallow empty tuple.
Guido van Rossum <guido@python.org>
parents:
26583
diff
changeset
|
431 return -1; |
|
d176cbfd3765
Tighten the tests for assignment to __bases__: disallow empty tuple.
Guido van Rossum <guido@python.org>
parents:
26583
diff
changeset
|
432 } |
| 26421 | 433 for (i = 0; i < PyTuple_GET_SIZE(value); i++) { |
| 434 ob = PyTuple_GET_ITEM(value, i); | |
| 435 if (!PyClass_Check(ob) && !PyType_Check(ob)) { | |
| 436 PyErr_Format( | |
| 437 PyExc_TypeError, | |
| 438 "%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
|
439 type->tp_name, Py_TYPE(ob)->tp_name); |
| 26421 | 440 return -1; |
| 441 } | |
|
26440
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
442 if (PyType_Check(ob)) { |
|
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
443 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
|
444 PyErr_SetString(PyExc_TypeError, |
|
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
445 "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
|
446 return -1; |
|
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
447 } |
| 26421 | 448 } |
| 449 } | |
| 450 | |
| 451 new_base = best_base(value); | |
| 452 | |
| 453 if (!new_base) { | |
| 454 return -1; | |
| 455 } | |
| 456 | |
| 457 if (!compatible_for_assignment(type->tp_base, new_base, "__bases__")) | |
| 458 return -1; | |
| 459 | |
| 460 Py_INCREF(new_base); | |
| 461 Py_INCREF(value); | |
| 462 | |
| 463 old_bases = type->tp_bases; | |
| 464 old_base = type->tp_base; | |
| 465 old_mro = type->tp_mro; | |
| 466 | |
| 467 type->tp_bases = value; | |
| 468 type->tp_base = new_base; | |
| 469 | |
| 470 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
|
471 goto bail; |
| 26421 | 472 } |
| 473 | |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
474 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
|
475 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
|
476 goto bail; |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
477 |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
478 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
|
479 |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
480 if (r < 0) { |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
481 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
|
482 PyTypeObject* cls; |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
483 PyObject* mro; |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
484 PyArg_UnpackTuple(PyList_GET_ITEM(temp, i), |
|
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
485 "", 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
|
486 Py_INCREF(mro); |
|
da403d2b886a
Fix a usage of the dangerous pattern decref - modify field - incref.
Armin Rigo <arigo@tunes.org>
parents:
41488
diff
changeset
|
487 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
|
488 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
|
489 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
|
490 } |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
491 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
|
492 goto bail; |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
493 } |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
494 |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
495 Py_DECREF(temp); |
| 26421 | 496 |
| 497 /* any base that was in __bases__ but now isn't, we | |
| 26660 | 498 need to remove |type| from its tp_subclasses. |
| 26421 | 499 conversely, any class now in __bases__ that wasn't |
| 26660 | 500 needs to have |type| added to its subclasses. */ |
| 26421 | 501 |
| 502 /* for now, sod that: just remove from all old_bases, | |
| 503 add to all new_bases */ | |
| 504 | |
| 505 for (i = PyTuple_GET_SIZE(old_bases) - 1; i >= 0; i--) { | |
| 506 ob = PyTuple_GET_ITEM(old_bases, i); | |
| 507 if (PyType_Check(ob)) { | |
| 508 remove_subclass( | |
| 509 (PyTypeObject*)ob, type); | |
| 510 } | |
| 511 } | |
| 512 | |
| 513 for (i = PyTuple_GET_SIZE(value) - 1; i >= 0; i--) { | |
| 514 ob = PyTuple_GET_ITEM(value, i); | |
| 515 if (PyType_Check(ob)) { | |
| 516 if (add_subclass((PyTypeObject*)ob, type) < 0) | |
| 517 r = -1; | |
| 518 } | |
| 519 } | |
| 520 | |
| 521 update_all_slots(type); | |
| 522 | |
| 523 Py_DECREF(old_bases); | |
| 524 Py_DECREF(old_base); | |
| 525 Py_DECREF(old_mro); | |
| 526 | |
| 527 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
|
528 |
|
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
|
529 bail: |
|
30084
d05d0ed465d8
Repair refcounting on error return from type_set_bases.
Michael W. Hudson <mwh@python.net>
parents:
29900
diff
changeset
|
530 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
|
531 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
|
532 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
|
533 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
|
534 } |
|
d05d0ed465d8
Repair refcounting on error return from type_set_bases.
Michael W. Hudson <mwh@python.net>
parents:
29900
diff
changeset
|
535 |
|
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
|
536 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
|
537 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
|
538 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
|
539 |
|
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
|
540 return -1; |
| 26421 | 541 } |
| 542 | |
| 543 static PyObject * | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
544 type_dict(PyTypeObject *type, void *context) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
545 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
546 if (type->tp_dict == NULL) { |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
547 Py_INCREF(Py_None); |
|
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
548 return Py_None; |
|
2080
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
549 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
550 return PyDictProxy_New(type->tp_dict); |
|
2080
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
551 } |
|
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
552 |
|
22348
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
553 static PyObject * |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
554 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
|
555 { |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
556 PyObject *result; |
| 23118 | 557 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE) && type->tp_doc != NULL) |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
558 return PyString_FromString(type->tp_doc); |
| 23118 | 559 result = PyDict_GetItemString(type->tp_dict, "__doc__"); |
| 560 if (result == NULL) { | |
| 561 result = Py_None; | |
| 562 Py_INCREF(result); | |
|
22348
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
563 } |
|
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
|
564 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
|
565 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
|
566 (PyObject *)type); |
| 23118 | 567 } |
| 568 else { | |
| 569 Py_INCREF(result); | |
| 570 } | |
|
22348
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
571 return result; |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
572 } |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
573 |
|
48876
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
574 static PyObject * |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
575 type___instancecheck__(PyObject *type, PyObject *inst) |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
576 { |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
577 switch (_PyObject_RealIsInstance(inst, type)) { |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
578 case -1: |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
579 return NULL; |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
580 case 0: |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
581 Py_RETURN_FALSE; |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
582 default: |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
583 Py_RETURN_TRUE; |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
584 } |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
585 } |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
586 |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
587 |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
588 static PyObject * |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
589 type___subclasscheck__(PyObject *type, PyObject *inst) |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
590 { |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
591 switch (_PyObject_RealIsSubclass(inst, type)) { |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
592 case -1: |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
593 return NULL; |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
594 case 0: |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
595 Py_RETURN_FALSE; |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
596 default: |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
597 Py_RETURN_TRUE; |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
598 } |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
599 } |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
600 |
|
d01c1d768841
Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
Antoine Pitrou <solipsis@pitrou.net>
parents:
48854
diff
changeset
|
601 |
|
20595
c4d9d8674506
Add missing "static" declarations (found by "make smelly").
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
20586
diff
changeset
|
602 static PyGetSetDef type_getsets[] = { |
| 26421 | 603 {"__name__", (getter)type_name, (setter)type_set_name, NULL}, |
| 604 {"__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
|
605 {"__module__", (getter)type_module, (setter)type_set_module, NULL}, |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
606 {"__abstractmethods__", (getter)type_abstractmethods, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
607 (setter)type_set_abstractmethods, NULL}, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
608 {"__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
|
609 {"__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
|
610 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
611 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
612 |
|
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
|
613 |
|
45860
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
614 static PyObject* |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
615 type_richcompare(PyObject *v, PyObject *w, int op) |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
616 { |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
617 PyObject *result; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
618 Py_uintptr_t vv, ww; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
619 int c; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
620 |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
621 /* Make sure both arguments are types. */ |
|
57692
cb26299e0e52
fix the ignoring of __cmp__ method on metaclasses #7491
Benjamin Peterson <benjamin@python.org>
parents:
54118
diff
changeset
|
622 if (!PyType_Check(v) || !PyType_Check(w) || |
|
cb26299e0e52
fix the ignoring of __cmp__ method on metaclasses #7491
Benjamin Peterson <benjamin@python.org>
parents:
54118
diff
changeset
|
623 /* If there is a __cmp__ method defined, let it be called instead |
|
cb26299e0e52
fix the ignoring of __cmp__ method on metaclasses #7491
Benjamin Peterson <benjamin@python.org>
parents:
54118
diff
changeset
|
624 of our dumb function designed merely to warn. See bug |
|
cb26299e0e52
fix the ignoring of __cmp__ method on metaclasses #7491
Benjamin Peterson <benjamin@python.org>
parents:
54118
diff
changeset
|
625 #7491. */ |
|
cb26299e0e52
fix the ignoring of __cmp__ method on metaclasses #7491
Benjamin Peterson <benjamin@python.org>
parents:
54118
diff
changeset
|
626 Py_TYPE(v)->tp_compare || Py_TYPE(w)->tp_compare) { |
|
45860
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
627 result = Py_NotImplemented; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
628 goto out; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
629 } |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
630 |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
631 /* Py3K warning if comparison isn't == or != */ |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
632 if (Py_Py3kWarningFlag && op != Py_EQ && op != Py_NE && |
|
46573
aef3501d8e77
Use PyErr_WarnPy3k throughout
Benjamin Peterson <benjamin@python.org>
parents:
46107
diff
changeset
|
633 PyErr_WarnEx(PyExc_DeprecationWarning, |
|
46075
84bb7701efba
Make Py3k warnings consistent w.r.t. punctuation; also respect the
Georg Brandl <georg@python.org>
parents:
45860
diff
changeset
|
634 "type inequality comparisons not supported " |
|
46573
aef3501d8e77
Use PyErr_WarnPy3k throughout
Benjamin Peterson <benjamin@python.org>
parents:
46107
diff
changeset
|
635 "in 3.x", 1) < 0) { |
|
45860
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
636 return NULL; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
637 } |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
638 |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
639 /* Compare addresses */ |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
640 vv = (Py_uintptr_t)v; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
641 ww = (Py_uintptr_t)w; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
642 switch (op) { |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
643 case Py_LT: c = vv < ww; break; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
644 case Py_LE: c = vv <= ww; break; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
645 case Py_EQ: c = vv == ww; break; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
646 case Py_NE: c = vv != ww; break; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
647 case Py_GT: c = vv > ww; break; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
648 case Py_GE: c = vv >= ww; break; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
649 default: |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
650 result = Py_NotImplemented; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
651 goto out; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
652 } |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
653 result = c ? Py_True : Py_False; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
654 |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
655 /* incref and return */ |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
656 out: |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
657 Py_INCREF(result); |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
658 return result; |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
659 } |
|
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
660 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
661 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
662 type_repr(PyTypeObject *type) |
| 6 | 663 { |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
664 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
|
665 char *kind; |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
666 |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
667 mod = type_module(type, NULL); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
668 if (mod == NULL) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
669 PyErr_Clear(); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
670 else if (!PyString_Check(mod)) { |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
671 Py_DECREF(mod); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
672 mod = NULL; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
673 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
674 name = type_name(type, NULL); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
675 if (name == NULL) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
676 return NULL; |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
677 |
|
20076
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
678 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
|
679 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
|
680 else |
|
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
681 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
|
682 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
683 if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__")) { |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
684 rtn = PyString_FromFormat("<%s '%s.%s'>", |
|
20076
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
685 kind, |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
686 PyString_AS_STRING(mod), |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
687 PyString_AS_STRING(name)); |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
688 } |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
689 else |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
690 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
|
691 |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
692 Py_XDECREF(mod); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
693 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
|
694 return rtn; |
| 6 | 695 } |
| 696 | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
697 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
698 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
|
699 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
700 PyObject *obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
701 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
702 if (type->tp_new == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
703 PyErr_Format(PyExc_TypeError, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
704 "cannot create '%.100s' instances", |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
705 type->tp_name); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
706 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
707 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
708 |
|
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
|
709 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
|
710 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
|
711 /* 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
|
712 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
|
713 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
|
714 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
|
715 (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
|
716 (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
|
717 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
|
718 /* 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
|
719 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
|
720 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
|
721 return obj; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
722 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
|
723 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
|
724 type->tp_init != NULL && |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
725 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
|
726 Py_DECREF(obj); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
727 obj = NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
728 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
729 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
730 return obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
731 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
732 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
733 PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
734 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
|
735 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
736 PyObject *obj; |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
737 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
|
738 /* 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
|
739 |
|
b285decf0421
Repaired the debug Windows deaths in test_descr, by allocating enough
Tim Peters <tim.peters@gmail.com>
parents:
20277
diff
changeset
|
740 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
|
741 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
|
742 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
|
743 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
|
744 |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
745 if (obj == NULL) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
746 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
|
747 |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
748 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
|
749 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
750 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
|
751 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
|
752 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
753 if (type->tp_itemsize == 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
754 PyObject_INIT(obj, type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
755 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
756 (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
|
757 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
758 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
|
759 _PyObject_GC_TRACK(obj); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
760 return obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
761 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
762 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
763 PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
764 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
|
765 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
766 return type->tp_alloc(type, 0); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
767 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
768 |
|
20277
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
769 /* 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
|
770 |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
771 static int |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
772 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
|
773 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
774 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
|
775 PyMemberDef *mp; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
776 |
|
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
|
777 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
|
778 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
|
779 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
|
780 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
|
781 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
|
782 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
|
783 if (obj != NULL) { |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
784 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
|
785 if (err) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
786 return err; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
787 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
788 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
789 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
790 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
791 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
792 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
793 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
|
794 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
|
795 { |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
796 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
|
797 traverseproc basetraverse; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
798 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
799 /* 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
|
800 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
|
801 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
|
802 base = type; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
803 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
|
804 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
|
805 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
|
806 if (err) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
807 return err; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
808 } |
|
20277
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
809 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
|
810 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
|
811 } |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
812 |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
813 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
|
814 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
|
815 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
|
816 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
|
817 } |
|
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
818 |
|
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
819 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
|
820 /* For a heaptype, the instances count as references |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
821 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
|
822 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
|
823 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
|
824 |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
825 if (basetraverse) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
826 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
|
827 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
828 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
829 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
830 static void |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
831 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
|
832 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
833 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
|
834 PyMemberDef *mp; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
835 |
|
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
|
836 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
|
837 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
|
838 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
|
839 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
|
840 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
|
841 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
|
842 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
|
843 *(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
|
844 Py_DECREF(obj); |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
845 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
846 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
847 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
848 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
849 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
850 static int |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
851 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
|
852 { |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
853 PyTypeObject *type, *base; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
854 inquiry baseclear; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
855 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
856 /* 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
|
857 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
|
858 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
|
859 base = type; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
860 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
|
861 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
|
862 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
|
863 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
|
864 assert(base); |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
865 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
866 |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
867 /* 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
|
868 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
|
869 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
870 if (baseclear) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
871 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
|
872 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
|
873 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
874 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
875 static void |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
876 subtype_dealloc(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
877 { |
|
21246
cb921d483e00
The previous checkin to clear __slots__ variables did a little bit of
Guido van Rossum <guido@python.org>
parents:
21242
diff
changeset
|
878 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
|
879 destructor basedealloc; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
880 |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
881 /* 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
|
882 type = Py_TYPE(self); |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
883 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
|
884 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
885 /* 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
|
886 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
887 if (!PyType_IS_GC(type)) { |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
888 /* 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
|
889 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
|
890 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
|
891 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
|
892 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
|
893 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
894 /* 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
|
895 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
|
896 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
|
897 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
|
898 return; |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
899 } |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
900 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
901 /* 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
|
902 base = type; |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
903 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
|
904 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
|
905 base = base->tp_base; |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
906 assert(base); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
907 } |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
908 |
|
53372
318951890abb
fix a segfault when setting __class__ in __del__ #5283
Benjamin Peterson <benjamin@python.org>
parents:
52749
diff
changeset
|
909 /* Extract the type again; tp_del may have changed it */ |
|
318951890abb
fix a segfault when setting __class__ in __del__ #5283
Benjamin Peterson <benjamin@python.org>
parents:
52749
diff
changeset
|
910 type = Py_TYPE(self); |
|
318951890abb
fix a segfault when setting __class__ in __del__ #5283
Benjamin Peterson <benjamin@python.org>
parents:
52749
diff
changeset
|
911 |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
912 /* Call the base tp_dealloc() */ |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
913 assert(basedealloc); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
914 basedealloc(self); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
915 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
916 /* 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
|
917 Py_DECREF(type); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
918 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
919 /* Done */ |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
920 return; |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
921 } |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
922 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
923 /* 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
|
924 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
925 /* UnTrack and re-Track around the trashcan macro, alas */ |
| 27717 | 926 /* 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
|
927 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
|
928 ++_PyTrash_delete_nesting; |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
929 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
|
930 --_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
|
931 /* 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
|
932 * (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
|
933 * 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
|
934 * 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
|
935 */ |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
936 |
|
29442
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
937 /* 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
|
938 base = type; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
939 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
|
940 base = base->tp_base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
941 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
|
942 } |
|
cb921d483e00
The previous checkin to clear __slots__ variables did a little bit of
Guido van Rossum <guido@python.org>
parents:
21242
diff
changeset
|
943 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
944 /* 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
|
945 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
|
946 dict. */ |
|
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
947 |
|
29308
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
948 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
|
949 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
|
950 |
|
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
951 /* 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
|
952 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
|
953 _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
|
954 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
|
955 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
|
956 goto endlabel; /* resurrected */ |
|
8081643c373f
subtype_dealloc(): A more complete fix for critical bug 840829 +
Tim Peters <tim.peters@gmail.com>
parents:
30907
diff
changeset
|
957 else |
|
8081643c373f
subtype_dealloc(): A more complete fix for critical bug 840829 +
Tim Peters <tim.peters@gmail.com>
parents:
30907
diff
changeset
|
958 _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
|
959 /* 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
|
960 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
|
961 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
|
962 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
|
963 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
|
964 /* 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
|
965 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
|
966 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
|
967 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
|
968 _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
|
969 } |
|
29308
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
970 } |
|
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
971 |
|
29442
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
972 /* 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
|
973 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
|
974 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
|
975 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
|
976 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
|
977 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
|
978 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
|
979 } |
|
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
980 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
981 /* 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
|
982 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
|
983 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
|
984 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
|
985 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
|
986 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
|
987 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
|
988 *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
|
989 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
990 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
991 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
992 |
|
53372
318951890abb
fix a segfault when setting __class__ in __del__ #5283
Benjamin Peterson <benjamin@python.org>
parents:
52749
diff
changeset
|
993 /* Extract the type again; tp_del may have changed it */ |
|
318951890abb
fix a segfault when setting __class__ in __del__ #5283
Benjamin Peterson <benjamin@python.org>
parents:
52749
diff
changeset
|
994 type = Py_TYPE(self); |
|
318951890abb
fix a segfault when setting __class__ in __del__ #5283
Benjamin Peterson <benjamin@python.org>
parents:
52749
diff
changeset
|
995 |
|
30917
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
996 /* 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
|
997 * basedealloc knows about gc. |
|
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
998 */ |
|
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
999 if (PyType_IS_GC(base)) |
|
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
1000 _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
|
1001 assert(basedealloc); |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1002 basedealloc(self); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1003 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1004 /* 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
|
1005 Py_DECREF(type); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
1006 |
|
24653
1ab27c1770df
Fix a subtle bug in the trashcan code I added yesterday to
Guido van Rossum <guido@python.org>
parents:
24614
diff
changeset
|
1007 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
|
1008 ++_PyTrash_delete_nesting; |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
1009 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
|
1010 --_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
|
1011 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1012 /* 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
|
1013 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1014 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
|
1015 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1016 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
|
1017 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
|
1018 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
|
1019 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
|
1020 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
|
1021 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1022 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
|
1023 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
|
1024 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1025 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
|
1026 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
|
1027 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
|
1028 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
|
1029 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
|
1030 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
|
1031 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
|
1032 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
|
1033 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1034 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
|
1035 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
|
1036 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
|
1037 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1038 Q. Why did the last question say "immediately GC-track again"? |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1039 It's nowhere near immediately. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1040 |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1041 A. Because the code *used* to re-track immediately. Bad Idea. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1042 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
|
1043 (which can happen if any weakref callback gets invoked), it |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1044 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
|
1045 then. But we're already deleting self. Double dealloction is |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1046 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
|
1047 |
|
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
|
1048 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
|
1049 _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
|
1050 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1051 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
|
1052 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
|
1053 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1054 - 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
|
1055 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1056 - 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
|
1057 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1058 - 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
|
1059 is incremented and the code between trashcan begin and end is |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1060 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
|
1061 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1062 - this destroys much of the object's contents, including its |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1063 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
|
1064 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1065 - basedealloc() is called; this is really list_dealloc(), or |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1066 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
|
1067 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1068 - 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
|
1069 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
|
1070 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1071 - 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
|
1072 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1073 - 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
|
1074 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1075 - 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
|
1076 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1077 - later, the trashcan code starts deleting the objects from its |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1078 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
|
1079 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1080 - 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
|
1081 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1082 - 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
|
1083 cause problems) the object's type gets decref'ed a second |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1084 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
|
1085 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1086 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
|
1087 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
|
1088 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
|
1089 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
|
1090 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
|
1091 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
|
1092 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1093 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
|
1094 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
|
1095 the trashcan mechanism completely: the decremented level means |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1096 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
|
1097 *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
|
1098 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
|
1099 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
|
1100 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1101 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
|
1102 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
|
1103 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1104 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
|
1105 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
|
1106 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
|
1107 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
|
1108 */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1109 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1110 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1111 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
|
1112 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1113 /* type test with subclassing support */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1114 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1115 int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1116 PyType_IsSubtype(PyTypeObject *a, PyTypeObject *b) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1117 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1118 PyObject *mro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1119 |
|
19803
32cfce4d83dc
PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing
Guido van Rossum <guido@python.org>
parents:
19630
diff
changeset
|
1120 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
|
1121 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
|
1122 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1123 mro = a->tp_mro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1124 if (mro != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1125 /* Deal with multiple inheritance without recursion |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1126 by walking the MRO tuple */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1127 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1128 assert(PyTuple_Check(mro)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1129 n = PyTuple_GET_SIZE(mro); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1130 for (i = 0; i < n; i++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1131 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
|
1132 return 1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1133 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1134 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1135 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1136 else { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1137 /* 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
|
1138 do { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1139 if (a == b) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1140 return 1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1141 a = a->tp_base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1142 } while (a != NULL); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1143 return b == &PyBaseObject_Type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1144 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1145 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1146 |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1147 /* 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
|
1148 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
|
1149 (so we can't use PyObject_GetAttr) but still binding |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1150 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
|
1151 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
|
1152 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
|
1153 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1154 Two variants: |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1155 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1156 - 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
|
1157 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
|
1158 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1159 - lookup_method() always raises an exception upon errors. |
|
53904
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1160 |
|
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1161 - _PyObject_LookupSpecial() exported for the benefit of other places. |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1162 */ |
|
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
|
1163 |
|
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
|
1164 static PyObject * |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1165 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
|
1166 { |
|
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
|
1167 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
|
1168 |
|
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
|
1169 if (*attrobj == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1170 *attrobj = PyString_InternFromString(attrstr); |
|
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
|
1171 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
|
1172 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
|
1173 } |
|
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
|
1174 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
|
1175 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
|
1176 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
|
1177 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
|
1178 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
|
1179 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
|
1180 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
|
1181 } |
|
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
|
1182 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
|
1183 } |
|
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
|
1184 |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1185 static PyObject * |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1186 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
|
1187 { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1188 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
|
1189 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
|
1190 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
|
1191 return res; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1192 } |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1193 |
|
53904
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1194 PyObject * |
|
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1195 _PyObject_LookupSpecial(PyObject *self, char *attrstr, PyObject **attrobj) |
|
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1196 { |
|
53949
b7920e183422
can't handle classic classes here
Benjamin Peterson <benjamin@python.org>
parents:
53904
diff
changeset
|
1197 assert(!PyInstance_Check(self)); |
|
53904
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1198 return lookup_maybe(self, attrstr, attrobj); |
|
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1199 } |
|
1ecdca11eb9e
add _PyObject_LookupSpecial to handle fetching special method lookup
Benjamin Peterson <benjamin@python.org>
parents:
53372
diff
changeset
|
1200 |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1201 /* A variation of PyObject_CallMethod that uses lookup_method() |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1202 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
|
1203 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
|
1204 |
|
20595
c4d9d8674506
Add missing "static" declarations (found by "make smelly").
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
20586
diff
changeset
|
1205 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
|
1206 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
|
1207 { |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1208 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
|
1209 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
|
1210 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
|
1211 |
|
20225
aa18c0ecc4fb
call_method(), call_maybe(): fix a performance bug: the argument
Guido van Rossum <guido@python.org>
parents:
20220
diff
changeset
|
1212 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
|
1213 if (func == NULL) { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1214 va_end(va); |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1215 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
|
1216 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
|
1217 return NULL; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1218 } |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1219 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1220 if (format && *format) |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1221 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
|
1222 else |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1223 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
|
1224 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1225 va_end(va); |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1226 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1227 if (args == NULL) |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1228 return NULL; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1229 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1230 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
|
1231 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
|
1232 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1233 Py_DECREF(args); |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1234 Py_DECREF(func); |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1235 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1236 return retval; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1237 } |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1238 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1239 /* 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
|
1240 |
|
20595
c4d9d8674506
Add missing "static" declarations (found by "make smelly").
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
20586
diff
changeset
|
1241 static PyObject * |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1242 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
|
1243 { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1244 va_list va; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1245 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
|
1246 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
|
1247 |
|
20225
aa18c0ecc4fb
call_method(), call_maybe(): fix a performance bug: the argument
Guido van Rossum <guido@python.org>
parents:
20220
diff
changeset
|
1248 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
|
1249 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
|
1250 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
|
1251 if (!PyErr_Occurred()) { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1252 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
|
1253 return Py_NotImplemented; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1254 } |
| 19911 | 1255 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
|
1256 } |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1257 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1258 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
|
1259 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
|
1260 else |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1261 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
|
1262 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1263 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
|
1264 |
| 19911 | 1265 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
|
1266 return NULL; |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1267 |
| 19911 | 1268 assert(PyTuple_Check(args)); |
| 1269 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
|
1270 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1271 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
|
1272 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
|
1273 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1274 return retval; |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1275 } |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1276 |
|
20978
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1277 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
|
1278 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
|
1279 { |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1280 PyObject *bases, *base; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1281 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
|
1282 |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1283 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
|
1284 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
|
1285 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
|
1286 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
|
1287 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
|
1288 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
|
1289 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
|
1290 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
|
1291 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1292 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
|
1293 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
|
1294 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
|
1295 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
|
1296 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
|
1297 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
|
1298 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
|
1299 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1300 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
|
1301 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1302 |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1303 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
|
1304 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
|
1305 { |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1306 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
|
1307 |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1308 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
|
1309 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
|
1310 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
|
1311 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
|
1312 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
|
1313 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
|
1314 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1315 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
|
1316 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1317 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1318 /* |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1319 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
|
1320 "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
|
1321 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
|
1322 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
|
1323 (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
|
1324 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1325 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
|
1326 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1327 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
|
1328 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
|
1329 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1330 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
|
1331 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1332 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
|
1333 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
|
1334 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
|
1335 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1336 Monotonicity. |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1337 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
|
1338 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
|
1339 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1340 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
|
1341 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
|
1342 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
|
1343 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
|
1344 */ |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1345 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1346 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
|
1347 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
|
1348 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
|
1349 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
|
1350 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1351 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
|
1352 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
|
1353 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
|
1354 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1355 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
|
1356 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1357 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1358 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
|
1359 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
|
1360 { |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1361 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
|
1362 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
|
1363 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
|
1364 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
|
1365 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
|
1366 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1367 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
|
1368 return NULL; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1369 if (!PyString_Check(name)) { |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1370 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
|
1371 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
|
1372 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1373 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
|
1374 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1375 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1376 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
|
1377 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
|
1378 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1379 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
|
1380 /* 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
|
1381 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
|
1382 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1383 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
|
1384 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
|
1385 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
|
1386 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
|
1387 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
|
1388 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
|
1389 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
|
1390 "duplicate base class %s", |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1391 o ? PyString_AS_STRING(o) : "?"); |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1392 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
|
1393 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
|
1394 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1395 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1396 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1397 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
|
1398 } |
|
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 /* 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
|
1401 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1402 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
|
1403 insight into error reporting, report the classes that were candidates |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1404 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
|
1405 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
|
1406 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
|
1407 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1408 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1409 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
|
1410 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
|
1411 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1412 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
|
1413 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
|
1414 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
|
1415 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
|
1416 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
|
1417 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1418 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
|
1419 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
|
1420 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
|
1421 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
|
1422 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
|
1423 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
|
1424 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
|
1425 return; |
|
37067
1f4549865aad
Fix some missing checks after PyTuple_New, PyList_New, PyDict_New
Georg Brandl <georg@python.org>
parents:
36925
diff
changeset
|
1426 } |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1427 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1428 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1429 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
|
1430 |
|
28514
9400504cb0b2
SF bug #699934: Obscure error message
Raymond Hettinger <python@rcn.com>
parents:
28403
diff
changeset
|
1431 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
|
1432 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
|
1433 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
|
1434 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
|
1435 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
|
1436 off += PyOS_snprintf(buf + off, sizeof(buf) - off, " %s", |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1437 name ? PyString_AS_STRING(name) : "?"); |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1438 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
|
1439 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
|
1440 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
|
1441 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
|
1442 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1443 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1444 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
|
1445 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
|
1446 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1447 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1448 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
|
1449 pmerge(PyObject *acc, PyObject* to_merge) { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1450 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
|
1451 int *remain; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1452 int ok; |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1453 |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1454 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
|
1455 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1456 /* 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
|
1457 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
|
1458 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
|
1459 */ |
|
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
|
1460 remain = (int *)PyMem_MALLOC(SIZEOF_INT*to_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
|
1461 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
|
1462 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
|
1463 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
|
1464 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
|
1465 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1466 again: |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1467 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
|
1468 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
|
1469 PyObject *candidate; |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1470 |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1471 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
|
1472 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1473 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
|
1474 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
|
1475 continue; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1476 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1477 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1478 /* 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
|
1479 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1480 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
|
1481 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
|
1482 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
|
1483 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1484 |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1485 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
|
1486 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
|
1487 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
|
1488 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
|
1489 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
|
1490 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1491 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1492 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
|
1493 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
|
1494 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
|
1495 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
|
1496 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1497 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
|
1498 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
|
1499 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
|
1500 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
|
1501 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
|
1502 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1503 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1504 goto again; |
|
26227
529719a5350e
Repaired illegal syntax most compilers probably let slide (but MSVC
Tim Peters <tim.peters@gmail.com>
parents:
26222
diff
changeset
|
1505 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
|
1506 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1507 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1508 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
|
1509 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
|
1510 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
|
1511 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1512 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
|
1513 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
|
1514 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
|
1515 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1516 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1517 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1518 mro_implementation(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1519 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1520 Py_ssize_t i, n; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1521 int ok; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1522 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
|
1523 PyObject *to_merge, *bases_aslist; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1524 |
| 45004 | 1525 if (type->tp_dict == NULL) { |
| 1526 if (PyType_Ready(type) < 0) | |
|
23903
066f8938071a
Patch from SF bug 570483 (Tim Northover).
Guido van Rossum <guido@python.org>
parents:
23856
diff
changeset
|
1527 return NULL; |
|
066f8938071a
Patch from SF bug 570483 (Tim Northover).
Guido van Rossum <guido@python.org>
parents:
23856
diff
changeset
|
1528 } |
|
066f8938071a
Patch from SF bug 570483 (Tim Northover).
Guido van Rossum <guido@python.org>
parents:
23856
diff
changeset
|
1529 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1530 /* 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
|
1531 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
|
1532 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
|
1533 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1534 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
|
1535 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
|
1536 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
|
1537 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1538 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1539 bases = type->tp_bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1540 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
|
1541 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1542 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
|
1543 if (to_merge == NULL) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1544 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
|
1545 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1546 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
|
1547 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
|
1548 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
|
1549 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
|
1550 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
|
1551 ((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
|
1552 else |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1553 parentMRO = classic_mro(base); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1554 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
|
1555 Py_DECREF(to_merge); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1556 return NULL; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1557 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1558 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1559 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
|
1560 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1561 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1562 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
|
1563 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
|
1564 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
|
1565 return NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1566 } |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1567 /* 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
|
1568 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
|
1569 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
|
1570 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
|
1571 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
|
1572 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1573 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
|
1574 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1575 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
|
1576 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
|
1577 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
|
1578 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
|
1579 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1580 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1581 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
|
1582 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
|
1583 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
|
1584 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
|
1585 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
|
1586 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1587 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1588 return result; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1589 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1590 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1591 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
|
1592 mro_external(PyObject *self) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1593 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1594 PyTypeObject *type = (PyTypeObject *)self; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1595 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1596 return mro_implementation(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1597 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1598 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1599 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1600 mro_internal(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1601 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1602 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
|
1603 int checkit = 0; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1604 |
|
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
|
1605 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
|
1606 result = mro_implementation(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1607 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1608 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
|
1609 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
|
1610 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
|
1611 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
|
1612 if (mro == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1613 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1614 result = PyObject_CallObject(mro, NULL); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1615 Py_DECREF(mro); |
|
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 (result == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1618 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1619 tuple = PySequence_Tuple(result); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1620 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
|
1621 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
|
1622 return -1; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1623 if (checkit) { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1624 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
|
1625 PyObject *cls; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1626 PyTypeObject *solid; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1627 |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1628 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
|
1629 |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1630 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
|
1631 |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1632 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
|
1633 PyTypeObject *t; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1634 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
|
1635 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
|
1636 continue; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1637 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
|
1638 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
|
1639 "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
|
1640 Py_TYPE(cls)->tp_name); |
|
36169
652429c4f2a4
Fix ref/memory leak introduced in rev 41845.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36153
diff
changeset
|
1641 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
|
1642 return -1; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1643 } |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1644 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
|
1645 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
|
1646 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
|
1647 "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
|
1648 t->tp_name); |
|
36169
652429c4f2a4
Fix ref/memory leak introduced in rev 41845.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36153
diff
changeset
|
1649 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
|
1650 return -1; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1651 } |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1652 } |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1653 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1654 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
|
1655 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
1656 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
|
1657 /* 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
|
1658 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
|
1659 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
|
1660 |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
1661 PyType_Modified(type); |
|
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
|
1662 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1663 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1664 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1665 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1666 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1667 /* Calculate the best base amongst multiple base classes. |
| 41488 | 1668 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
|
1669 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1670 static PyTypeObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1671 best_base(PyObject *bases) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1672 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1673 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1674 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
|
1675 PyObject *base_proto; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1676 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1677 assert(PyTuple_Check(bases)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1678 n = PyTuple_GET_SIZE(bases); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1679 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
|
1680 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
|
1681 winner = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1682 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
|
1683 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
|
1684 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
|
1685 continue; |
| 41488 | 1686 if (!PyType_Check(base_proto)) { |
| 1687 PyErr_SetString( | |
| 1688 PyExc_TypeError, | |
| 1689 "bases must be types"); | |
| 1690 return NULL; | |
| 1691 } | |
|
20978
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1692 base_i = (PyTypeObject *)base_proto; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1693 if (base_i->tp_dict == NULL) { |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
1694 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
|
1695 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1696 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1697 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
|
1698 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
|
1699 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
|
1700 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
|
1701 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1702 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
|
1703 ; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1704 else if (PyType_IsSubtype(candidate, winner)) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1705 winner = candidate; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1706 base = base_i; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1707 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1708 else { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1709 PyErr_SetString( |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1710 PyExc_TypeError, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1711 "multiple bases have " |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1712 "instance lay-out conflict"); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1713 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1714 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1715 } |
| 21404 | 1716 if (base == NULL) |
| 1717 PyErr_SetString(PyExc_TypeError, | |
| 1718 "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
|
1719 return base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1720 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1721 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1722 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1723 extra_ivars(PyTypeObject *type, PyTypeObject *base) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1724 { |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
1725 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
|
1726 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
|
1727 |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1728 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
|
1729 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
|
1730 /* If itemsize is involved, stricter rules */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1731 return t_size != b_size || |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1732 type->tp_itemsize != base->tp_itemsize; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1733 } |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1734 if (type->tp_weaklistoffset && base->tp_weaklistoffset == 0 && |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1735 type->tp_weaklistoffset + sizeof(PyObject *) == t_size && |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1736 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
|
1737 t_size -= sizeof(PyObject *); |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1738 if (type->tp_dictoffset && base->tp_dictoffset == 0 && |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1739 type->tp_dictoffset + sizeof(PyObject *) == t_size && |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1740 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
|
1741 t_size -= sizeof(PyObject *); |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1742 |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1743 return t_size != b_size; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1744 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1745 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1746 static PyTypeObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1747 solid_base(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1748 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1749 PyTypeObject *base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1750 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1751 if (type->tp_base) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1752 base = solid_base(type->tp_base); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1753 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1754 base = &PyBaseObject_Type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1755 if (extra_ivars(type, base)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1756 return type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1757 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1758 return base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1759 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1760 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1761 static void object_dealloc(PyObject *); |
|
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1762 static int object_init(PyObject *, PyObject *, PyObject *); |
|
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1763 static int update_slot(PyTypeObject *, PyObject *); |
|
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1764 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
|
1765 |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1766 /* |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1767 * 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
|
1768 * 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
|
1769 * 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
|
1770 */ |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1771 static PyTypeObject * |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1772 get_builtin_base_with_dict(PyTypeObject *type) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1773 { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1774 while (type->tp_base != NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1775 if (type->tp_dictoffset != 0 && |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1776 !(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1777 return type; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1778 type = type->tp_base; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1779 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1780 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1781 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1782 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1783 static PyObject * |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1784 get_dict_descriptor(PyTypeObject *type) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1785 { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1786 static PyObject *dict_str; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1787 PyObject *descr; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1788 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1789 if (dict_str == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1790 dict_str = PyString_InternFromString("__dict__"); |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1791 if (dict_str == NULL) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1792 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1793 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1794 descr = _PyType_Lookup(type, dict_str); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1795 if (descr == NULL || !PyDescr_IsData(descr)) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1796 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1797 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1798 return descr; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1799 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1800 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1801 static void |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1802 raise_dict_descr_error(PyObject *obj) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1803 { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1804 PyErr_Format(PyExc_TypeError, |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1805 "this __dict__ descriptor does not support " |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1806 "'%.200s' objects", obj->ob_type->tp_name); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1807 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1808 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1809 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
|
1810 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
|
1811 { |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1812 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
|
1813 PyObject *dict; |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1814 PyTypeObject *base; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1815 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1816 base = get_builtin_base_with_dict(obj->ob_type); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1817 if (base != NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1818 descrgetfunc func; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1819 PyObject *descr = get_dict_descriptor(base); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1820 if (descr == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1821 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1822 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1823 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1824 func = descr->ob_type->tp_descr_get; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1825 if (func == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1826 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1827 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1828 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1829 return func(descr, obj, (PyObject *)(obj->ob_type)); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1830 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1831 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1832 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
|
1833 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
|
1834 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
|
1835 "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
|
1836 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
|
1837 } |
|
337b53679c73
Pytype_GenericAlloc(): round up size so we zap all four bytes of the
Guido van Rossum <guido@python.org>
parents:
19595
diff
changeset
|
1838 dict = *dictptr; |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1839 if (dict == NULL) |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1840 *dictptr = dict = PyDict_New(); |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1841 Py_XINCREF(dict); |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1842 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
|
1843 } |
|
337b53679c73
Pytype_GenericAlloc(): round up size so we zap all four bytes of the
Guido van Rossum <guido@python.org>
parents:
19595
diff
changeset
|
1844 |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1845 static int |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1846 subtype_setdict(PyObject *obj, PyObject *value, void *context) |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1847 { |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1848 PyObject **dictptr; |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1849 PyObject *dict; |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1850 PyTypeObject *base; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1851 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1852 base = get_builtin_base_with_dict(obj->ob_type); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1853 if (base != NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1854 descrsetfunc func; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1855 PyObject *descr = get_dict_descriptor(base); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1856 if (descr == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1857 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1858 return -1; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1859 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1860 func = descr->ob_type->tp_descr_set; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1861 if (func == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1862 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1863 return -1; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1864 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1865 return func(descr, obj, value); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1866 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1867 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1868 dictptr = _PyObject_GetDictPtr(obj); |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1869 if (dictptr == NULL) { |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1870 PyErr_SetString(PyExc_AttributeError, |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1871 "This object has no __dict__"); |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1872 return -1; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1873 } |
|
21235
b782490da7f0
At the PythonLabs meeting someone mentioned it would make Jim really
Guido van Rossum <guido@python.org>
parents:
21192
diff
changeset
|
1874 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
|
1875 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
|
1876 "__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
|
1877 "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
|
1878 return -1; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1879 } |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1880 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
|
1881 Py_XINCREF(value); |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1882 *dictptr = value; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1883 Py_XDECREF(dict); |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1884 return 0; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1885 } |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1886 |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1887 static PyObject * |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1888 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
|
1889 { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1890 PyObject **weaklistptr; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1891 PyObject *result; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1892 |
|
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
|
1893 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
|
1894 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
|
1895 "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
|
1896 return NULL; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1897 } |
|
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
|
1898 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
|
1899 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
|
1900 (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
|
1901 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
|
1902 ((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
|
1903 if (*weaklistptr == NULL) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1904 result = Py_None; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1905 else |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1906 result = *weaklistptr; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1907 Py_INCREF(result); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1908 return result; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1909 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1910 |
|
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
|
1911 /* 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
|
1912 |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1913 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
|
1914 {"__dict__", subtype_dict, subtype_setdict, |
|
24785
4de9ac0e4173
Allow docstrings to be removed during compilation
Neal Norwitz <nnorwitz@gmail.com>
parents:
24762
diff
changeset
|
1915 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
|
1916 {"__weakref__", subtype_getweakref, NULL, |
|
24785
4de9ac0e4173
Allow docstrings to be removed during compilation
Neal Norwitz <nnorwitz@gmail.com>
parents:
24762
diff
changeset
|
1917 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
|
1918 {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
|
1919 }; |
|
337b53679c73
Pytype_GenericAlloc(): round up size so we zap all four bytes of the
Guido van Rossum <guido@python.org>
parents:
19595
diff
changeset
|
1920 |
|
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
|
1921 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
|
1922 {"__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
|
1923 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
|
1924 {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
|
1925 }; |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1926 |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1927 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
|
1928 {"__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
|
1929 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
|
1930 {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
|
1931 }; |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1932 |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1933 static int |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1934 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
|
1935 { |
|
24245
50443127b21d
valid_identifier(): use an unsigned char* so that isalpha() will do
Guido van Rossum <guido@python.org>
parents:
24184
diff
changeset
|
1936 unsigned char *p; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1937 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
|
1938 |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1939 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
|
1940 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
|
1941 "__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
|
1942 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
|
1943 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1944 } |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1945 p = (unsigned char *) PyString_AS_STRING(s); |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
1946 n = PyString_GET_SIZE(s); |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1947 /* 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
|
1948 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
|
1949 if (n == 0) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1950 n = 1; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1951 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
|
1952 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
|
1953 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
|
1954 "__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
|
1955 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1956 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1957 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1958 return 1; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1959 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1960 |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1961 #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
|
1962 /* 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
|
1963 |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1964 static PyObject * |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
1965 _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
|
1966 { |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1967 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
|
1968 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
|
1969 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
|
1970 |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1971 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
|
1972 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
|
1973 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
|
1974 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
|
1975 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
|
1976 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
|
1977 } |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1978 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
|
1979 NULL); |
|
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1980 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
|
1981 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
|
1982 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
|
1983 } |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1984 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
|
1985 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
|
1986 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
|
1987 } |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1988 } |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1989 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
|
1990 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
|
1991 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
|
1992 } |
|
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1993 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
|
1994 } |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1995 #endif |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1996 |
|
41287
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1997 /* Forward */ |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1998 static int |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1999 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
|
2000 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2001 static int |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2002 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
|
2003 { |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2004 int res; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2005 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2006 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
|
2007 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
|
2008 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2009 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
|
2010 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
|
2011 "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
|
2012 return -1; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2013 } |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2014 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2015 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
|
2016 (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
|
2017 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
|
2018 "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
|
2019 return -1; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2020 } |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2021 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2022 /* 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
|
2023 /* 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
|
2024 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
|
2025 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
|
2026 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
|
2027 return res; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2028 } |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
2029 |
|
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
|
2030 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2031 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
|
2032 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2033 PyObject *name, *bases, *dict; |
|
36675
dba6494735d0
Revert backwards-incompatible const changes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36631
diff
changeset
|
2034 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
|
2035 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
|
2036 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
|
2037 PyHeapTypeObject *et; |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
2038 PyMemberDef *mp; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
2039 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
|
2040 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
|
2041 |
|
20725
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
2042 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
|
2043 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
|
2044 |
|
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
|
2045 /* 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
|
2046 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
2047 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
|
2048 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
|
2049 |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
2050 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
|
2051 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
|
2052 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
|
2053 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
|
2054 } |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
2055 |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
2056 /* 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
|
2057 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
|
2058 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
|
2059 if (nargs + nkwds != 3) { |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
2060 PyErr_SetString(PyExc_TypeError, |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
2061 "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
|
2062 return NULL; |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
2063 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2064 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2065 |
|
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
|
2066 /* Check arguments: (name, bases, dict) */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2067 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
|
2068 &name, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2069 &PyTuple_Type, &bases, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2070 &PyDict_Type, &dict)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2071 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2072 |
| 41488 | 2073 /* Determine the proper metatype to deal with this, |
| 2074 and check for metatype conflicts while we're at it. | |
| 2075 Note that if some other metatype wins to contract, | |
| 2076 it's possible that its instances are not types. */ | |
| 2077 nbases = PyTuple_GET_SIZE(bases); | |
| 2078 winner = metatype; | |
| 2079 for (i = 0; i < nbases; i++) { | |
| 2080 tmp = PyTuple_GET_ITEM(bases, i); | |
| 2081 tmptype = tmp->ob_type; | |
| 2082 if (tmptype == &PyClass_Type) | |
| 2083 continue; /* Special case classic classes */ | |
| 2084 if (PyType_IsSubtype(winner, tmptype)) | |
| 2085 continue; | |
| 2086 if (PyType_IsSubtype(tmptype, winner)) { | |
| 2087 winner = tmptype; | |
| 2088 continue; | |
| 2089 } | |
| 2090 PyErr_SetString(PyExc_TypeError, | |
| 2091 "metaclass conflict: " | |
| 2092 "the metaclass of a derived class " | |
| 2093 "must be a (non-strict) subclass " | |
| 2094 "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
|
2095 return NULL; |
| 41488 | 2096 } |
|
40975
d62805a993c5
Add checking for a number of metaclass error conditions.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40974
diff
changeset
|
2097 if (winner != metatype) { |
| 41488 | 2098 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
|
2099 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
|
2100 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
|
2101 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2102 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2103 /* Adjust for empty tuple bases */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2104 if (nbases == 0) { |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
2105 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
|
2106 if (bases == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2107 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2108 nbases = 1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2109 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2110 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2111 Py_INCREF(bases); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2112 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2113 /* 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
|
2114 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2115 /* 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
|
2116 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
|
2117 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
|
2118 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2119 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
|
2120 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2121 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
|
2122 PyErr_Format(PyExc_TypeError, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2123 "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
|
2124 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
|
2125 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2126 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2127 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2128 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2129 /* 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
|
2130 slots = PyDict_GetItemString(dict, "__slots__"); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2131 nslots = 0; |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
2132 add_dict = 0; |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
2133 add_weak = 0; |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2134 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
|
2135 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
|
2136 if (slots == NULL) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2137 if (may_add_dict) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2138 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2139 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2140 if (may_add_weak) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2141 add_weak++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2142 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2143 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2144 else { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2145 /* Have slots */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2146 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2147 /* Make it into a tuple */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2148 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
|
2149 slots = PyTuple_Pack(1, slots); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2150 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2151 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
|
2152 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
|
2153 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2154 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
|
2155 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2156 assert(PyTuple_Check(slots)); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2157 |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2158 /* Are slots allowed? */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2159 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
|
2160 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
|
2161 PyErr_Format(PyExc_TypeError, |
|
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2162 "nonempty __slots__ " |
|
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2163 "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
|
2164 base->tp_name); |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2165 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
|
2166 Py_DECREF(bases); |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2167 Py_DECREF(slots); |
|
19595
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2168 return NULL; |
|
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2169 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2170 |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
2171 #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
|
2172 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
|
2173 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
|
2174 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
|
2175 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
|
2176 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
|
2177 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
|
2178 } |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
2179 #endif |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2180 /* 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
|
2181 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
|
2182 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
|
2183 char *s; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2184 if (!valid_identifier(tmp)) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2185 goto bad_slots; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2186 assert(PyString_Check(tmp)); |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2187 s = PyString_AS_STRING(tmp); |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2188 if (strcmp(s, "__dict__") == 0) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2189 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
|
2190 PyErr_SetString(PyExc_TypeError, |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2191 "__dict__ slot disallowed: " |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2192 "we already got one"); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2193 goto bad_slots; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2194 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2195 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2196 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2197 if (strcmp(s, "__weakref__") == 0) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2198 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
|
2199 PyErr_SetString(PyExc_TypeError, |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2200 "__weakref__ slot disallowed: " |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2201 "either we already got one, " |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2202 "or __itemsize__ != 0"); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2203 goto bad_slots; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2204 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2205 add_weak++; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2206 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2207 } |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2208 |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2209 /* 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
|
2210 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
|
2211 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
|
2212 */ |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2213 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
|
2214 if (newslots == NULL) |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2215 goto bad_slots; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2216 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
|
2217 char *s; |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2218 tmp = PyTuple_GET_ITEM(slots, i); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2219 s = PyString_AS_STRING(tmp); |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2220 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
|
2221 (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
|
2222 continue; |
|
35742
1c4d192f1568
Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35637
diff
changeset
|
2223 tmp =_Py_Mangle(name, tmp); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2224 if (!tmp) |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2225 goto bad_slots; |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2226 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
|
2227 j++; |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2228 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2229 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
|
2230 nslots = j; |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2231 Py_DECREF(slots); |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2232 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
|
2233 Py_DECREF(bases); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2234 Py_DECREF(newslots); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2235 return NULL; |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2236 } |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2237 slots = PyList_AsTuple(newslots); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2238 Py_DECREF(newslots); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2239 if (slots == NULL) { |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2240 Py_DECREF(bases); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2241 return NULL; |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2242 } |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2243 |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2244 /* 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
|
2245 if (nbases > 1 && |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2246 ((may_add_dict && !add_dict) || |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2247 (may_add_weak && !add_weak))) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2248 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
|
2249 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
|
2250 if (tmp == (PyObject *)base) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2251 continue; /* Skip primary base */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2252 if (PyClass_Check(tmp)) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2253 /* Classic base class provides both */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2254 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
|
2255 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2256 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
|
2257 add_weak++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2258 break; |
|
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 assert(PyType_Check(tmp)); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2261 tmptype = (PyTypeObject *)tmp; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2262 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
|
2263 tmptype->tp_dictoffset != 0) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2264 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2265 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
|
2266 tmptype->tp_weaklistoffset != 0) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2267 add_weak++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2268 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
|
2269 continue; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2270 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
|
2271 continue; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2272 /* Nothing more to check */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2273 break; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2274 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2275 } |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
2276 } |
|
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 /* 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
|
2279 "return NULL" may leak slots! */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2280 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2281 /* Allocate the type object */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2282 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
|
2283 if (type == NULL) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2284 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
|
2285 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2286 return NULL; |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2287 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2288 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2289 /* 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
|
2290 et = (PyHeapTypeObject *)type; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2291 Py_INCREF(name); |
|
36631
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
2292 et->ht_name = name; |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
2293 et->ht_slots = slots; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2294 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2295 /* Initialize tp_flags */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2296 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
|
2297 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
|
2298 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
|
2299 type->tp_flags |= Py_TPFLAGS_HAVE_GC; |
|
52749
75efd757434b
Issue #2396: backport the memoryview object.
Antoine Pitrou <solipsis@pitrou.net>
parents:
52176
diff
changeset
|
2300 if (base->tp_flags & Py_TPFLAGS_HAVE_NEWBUFFER) |
|
75efd757434b
Issue #2396: backport the memoryview object.
Antoine Pitrou <solipsis@pitrou.net>
parents:
52176
diff
changeset
|
2301 type->tp_flags |= Py_TPFLAGS_HAVE_NEWBUFFER; |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2302 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2303 /* 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
|
2304 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
|
2305 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
|
2306 (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
|
2307 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
|
2308 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2309 /* Initialize essential fields */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2310 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
|
2311 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
|
2312 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
|
2313 type->tp_as_buffer = &et->as_buffer; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2314 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
|
2315 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2316 /* Set tp_base and tp_bases */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2317 type->tp_bases = bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2318 Py_INCREF(base); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2319 type->tp_base = base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2320 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
2321 /* 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
|
2322 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
|
2323 if (dict == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2324 Py_DECREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2325 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2326 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2327 |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2328 /* Set __module__ in the dict */ |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2329 if (PyDict_GetItemString(dict, "__module__") == NULL) { |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2330 tmp = PyEval_GetGlobals(); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2331 if (tmp != NULL) { |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2332 tmp = PyDict_GetItemString(tmp, "__name__"); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2333 if (tmp != NULL) { |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2334 if (PyDict_SetItemString(dict, "__module__", |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2335 tmp) < 0) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2336 return NULL; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2337 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2338 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2339 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2340 |
|
20239
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2341 /* 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
|
2342 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
|
2343 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
|
2344 */ |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2345 { |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2346 PyObject *doc = PyDict_GetItemString(dict, "__doc__"); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2347 if (doc != NULL && PyString_Check(doc)) { |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2348 const size_t n = (size_t)PyString_GET_SIZE(doc); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2349 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
|
2350 if (tp_doc == NULL) { |
|
20239
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2351 Py_DECREF(type); |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2352 return NULL; |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2353 } |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2354 memcpy(tp_doc, PyString_AS_STRING(doc), n+1); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2355 type->tp_doc = tp_doc; |
|
20239
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2356 } |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2357 } |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2358 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2359 /* 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
|
2360 make it a static function */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2361 tmp = PyDict_GetItemString(dict, "__new__"); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2362 if (tmp != NULL && PyFunction_Check(tmp)) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2363 tmp = PyStaticMethod_New(tmp); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2364 if (tmp == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2365 Py_DECREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2366 return NULL; |
|
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 PyDict_SetItemString(dict, "__new__", tmp); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2369 Py_DECREF(tmp); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2370 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2371 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2372 /* 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
|
2373 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
|
2374 slotoffset = base->tp_basicsize; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2375 if (slots != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2376 for (i = 0; i < nslots; i++, mp++) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2377 mp->name = PyString_AS_STRING( |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2378 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
|
2379 mp->type = T_OBJECT_EX; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2380 mp->offset = slotoffset; |
|
41110
a8ae2c29c66a
Patch #1675981: remove unreachable code from type.__new__() method.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
40975
diff
changeset
|
2381 |
|
a8ae2c29c66a
Patch #1675981: remove unreachable code from type.__new__() method.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
40975
diff
changeset
|
2382 /* __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
|
2383 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
|
2384 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
|
2385 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2386 slotoffset += sizeof(PyObject *); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2387 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2388 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2389 if (add_dict) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2390 if (base->tp_itemsize) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2391 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
|
2392 else |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2393 type->tp_dictoffset = slotoffset; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2394 slotoffset += sizeof(PyObject *); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2395 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2396 if (add_weak) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2397 assert(!base->tp_itemsize); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2398 type->tp_weaklistoffset = slotoffset; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2399 slotoffset += sizeof(PyObject *); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2400 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2401 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
|
2402 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
|
2403 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
|
2404 |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
2405 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
|
2406 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
|
2407 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
|
2408 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
|
2409 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
|
2410 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
|
2411 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
|
2412 type->tp_getset = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2413 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2414 /* Special case some slots */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2415 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
|
2416 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
|
2417 type->tp_getattro = PyObject_GenericGetAttr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2418 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
|
2419 type->tp_setattro = PyObject_GenericSetAttr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2420 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2421 type->tp_dealloc = subtype_dealloc; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2422 |
|
20277
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
2423 /* 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
|
2424 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
|
2425 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
|
2426 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
|
2427 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2428 /* 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
|
2429 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
|
2430 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
|
2431 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
|
2432 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
|
2433 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
|
2434 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2435 else |
|
22980
9f949027d7ba
Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
22871
diff
changeset
|
2436 type->tp_free = PyObject_Del; |
|
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 /* Initialize the rest */ |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
2439 if (PyType_Ready(type) < 0) { |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2440 Py_DECREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2441 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2442 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2443 |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
2444 /* 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
|
2445 fixup_slot_dispatchers(type); |
| 19036 | 2446 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2447 return (PyObject *)type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2448 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2449 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2450 /* 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
|
2451 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
|
2452 PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2453 _PyType_Lookup(PyTypeObject *type, PyObject *name) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2454 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
2455 Py_ssize_t i, n; |
|
47371
e81d02d09697
Revert #2990 patch; it's not necessary as Armin showed.
Georg Brandl <georg@python.org>
parents:
47360
diff
changeset
|
2456 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
|
2457 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
|
2458 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2459 if (MCACHE_CACHEABLE_NAME(name) && |
| 45004 | 2460 PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) { |
|
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
|
2461 /* 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
|
2462 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
|
2463 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
|
2464 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
|
2465 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
|
2466 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2467 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
2468 /* 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
|
2469 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
|
2470 |
|
41097e92f560
Three's a charm: yet another fix for SF bug 551412. Thinking again
Guido van Rossum <guido@python.org>
parents:
23666
diff
changeset
|
2471 /* 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
|
2472 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
|
2473 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
|
2474 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
|
2475 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
|
2476 |
|
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
|
2477 res = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2478 assert(PyTuple_Check(mro)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2479 n = PyTuple_GET_SIZE(mro); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2480 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
|
2481 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
|
2482 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
|
2483 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
|
2484 else { |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
2485 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
|
2486 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
|
2487 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2488 assert(dict && PyDict_Check(dict)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2489 res = PyDict_GetItem(dict, name); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2490 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
|
2491 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
|
2492 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2493 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2494 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
|
2495 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
|
2496 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
|
2497 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
|
2498 Py_INCREF(name); |
|
47371
e81d02d09697
Revert #2990 patch; it's not necessary as Armin showed.
Georg Brandl <georg@python.org>
parents:
47360
diff
changeset
|
2499 Py_DECREF(method_cache[h].name); |
|
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
|
2500 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
|
2501 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2502 return res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2503 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2504 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2505 /* This is similar to PyObject_GenericGetAttr(), |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2506 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
|
2507 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2508 type_getattro(PyTypeObject *type, PyObject *name) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2509 { |
|
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
|
2510 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
|
2511 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
|
2512 descrgetfunc meta_get; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2513 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2514 /* 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
|
2515 if (type->tp_dict == NULL) { |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
2516 if (PyType_Ready(type) < 0) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2517 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2518 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2519 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2520 /* 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
|
2521 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
|
2522 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2523 /* 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
|
2524 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
|
2525 |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2526 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
|
2527 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
|
2528 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2529 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
|
2530 /* 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
|
2531 * 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
|
2532 * 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
|
2533 */ |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2534 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
|
2535 (PyObject *)metatype); |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2536 } |
| 30159 | 2537 Py_INCREF(meta_attribute); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2538 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2539 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2540 /* 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
|
2541 * 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
|
2542 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
|
2543 if (attribute != NULL) { |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2544 /* 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
|
2545 descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get; |
| 30159 | 2546 |
| 2547 Py_XDECREF(meta_attribute); | |
| 2548 | |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2549 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
|
2550 /* 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
|
2551 * 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
|
2552 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
|
2553 (PyObject *)type); |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2554 } |
|
24184
c4dcb80f48ea
object.h special-build macro minefield: renamed all the new lexical
Tim Peters <tim.peters@gmail.com>
parents:
23967
diff
changeset
|
2555 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2556 Py_INCREF(attribute); |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2557 return attribute; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2558 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2559 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2560 /* 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
|
2561 * descriptor from the metatype, if any */ |
| 30159 | 2562 if (meta_get != NULL) { |
| 2563 PyObject *res; | |
| 2564 res = meta_get(meta_attribute, (PyObject *)type, | |
| 2565 (PyObject *)metatype); | |
| 2566 Py_DECREF(meta_attribute); | |
| 2567 return res; | |
| 2568 } | |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2569 |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2570 /* 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
|
2571 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
|
2572 return meta_attribute; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2573 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2574 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2575 /* Give up */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2576 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
|
2577 "type object '%.50s' has no attribute '%.400s'", |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2578 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
|
2579 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2580 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2581 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2582 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2583 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
|
2584 { |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2585 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
|
2586 PyErr_Format( |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2587 PyExc_TypeError, |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2588 "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
|
2589 type->tp_name); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2590 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
|
2591 } |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2592 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
|
2593 return -1; |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2594 return update_slot(type, name); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2595 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2596 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2597 static void |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2598 type_dealloc(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2599 { |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
2600 PyHeapTypeObject *et; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2601 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2602 /* 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
|
2603 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
|
2604 _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
|
2605 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
|
2606 et = (PyHeapTypeObject *)type; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2607 Py_XDECREF(type->tp_base); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2608 Py_XDECREF(type->tp_dict); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2609 Py_XDECREF(type->tp_bases); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2610 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
|
2611 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
|
2612 Py_XDECREF(type->tp_subclasses); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2613 /* 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
|
2614 * 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
|
2615 */ |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35742
diff
changeset
|
2616 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
|
2617 Py_XDECREF(et->ht_name); |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
2618 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
|
2619 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
|
2620 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2621 |
|
20315
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2622 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
|
2623 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
|
2624 { |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2625 PyObject *list, *raw, *ref; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
2626 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
|
2627 |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2628 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
|
2629 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
|
2630 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
|
2631 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
|
2632 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
|
2633 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
|
2634 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
|
2635 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
|
2636 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
|
2637 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
|
2638 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
|
2639 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
|
2640 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
|
2641 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
|
2642 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
|
2643 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
|
2644 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2645 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2646 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2647 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
|
2648 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2649 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2650 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
|
2651 {"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
|
2652 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
|
2653 {"__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
|
2654 PyDoc_STR("__subclasses__() -> list of immediate subclasses")}, |
|
54118
ae006386ec39
properly lookup __instancecheck__ and __subclasscheck__
Benjamin Peterson <benjamin@python.org>
parents:
53949
diff
changeset
|
2655 {"__instancecheck__", type___instancecheck__, METH_O, |
|
ae006386ec39
properly lookup __instancecheck__ and __subclasscheck__
Benjamin Peterson <benjamin@python.org>
parents:
53949
diff
changeset
|
2656 PyDoc_STR("__instancecheck__() -> check if an object is an instance")}, |
|
ae006386ec39
properly lookup __instancecheck__ and __subclasscheck__
Benjamin Peterson <benjamin@python.org>
parents:
53949
diff
changeset
|
2657 {"__subclasscheck__", type___subclasscheck__, METH_O, |
|
ae006386ec39
properly lookup __instancecheck__ and __subclasscheck__
Benjamin Peterson <benjamin@python.org>
parents:
53949
diff
changeset
|
2658 PyDoc_STR("__subclasschck__ -> check if an class is a subclass")}, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2659 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2660 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2661 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23830
diff
changeset
|
2662 PyDoc_STRVAR(type_doc, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2663 "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
|
2664 "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
|
2665 |
|
20220
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2666 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
|
2667 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
|
2668 { |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2669 /* 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
|
2670 for heaptypes. */ |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2671 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
|
2672 |
|
37756
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
2673 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
|
2674 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
|
2675 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
|
2676 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
|
2677 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
|
2678 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2679 /* 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
|
2680 ((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
|
2681 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
|
2682 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
|
2683 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2684 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
|
2685 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2686 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2687 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
|
2688 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
|
2689 { |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2690 /* 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
|
2691 for heaptypes. */ |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2692 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
|
2693 |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2694 /* 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
|
2695 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
|
2696 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
|
2697 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
|
2698 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
|
2699 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2700 tp_dict: |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2701 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
|
2702 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2703 tp_cache: |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2704 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
|
2705 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2706 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
|
2707 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
|
2708 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
|
2709 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
|
2710 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2711 tp_subclasses: |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2712 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
|
2713 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
|
2714 |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
2715 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
|
2716 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
|
2717 */ |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2718 |
|
37748
d1547426ab61
Use Py_CLEAR instead of in-place DECREF/XDECREF or custom macros, for
Thomas Wouters <thomas@python.org>
parents:
37603
diff
changeset
|
2719 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
|
2720 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2721 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
|
2722 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2723 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2724 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
|
2725 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
|
2726 { |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2727 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
|
2728 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2729 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
2730 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
|
2731 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
|
2732 "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
|
2733 sizeof(PyHeapTypeObject), /* tp_basicsize */ |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
2734 sizeof(PyMemberDef), /* tp_itemsize */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2735 (destructor)type_dealloc, /* tp_dealloc */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2736 0, /* tp_print */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2737 0, /* tp_getattr */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2738 0, /* tp_setattr */ |
|
57748
c2e4cfbb398c
remove type_compare, since type_richcompare does the same trick
Benjamin Peterson <benjamin@python.org>
parents:
57692
diff
changeset
|
2739 0, /* tp_compare */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2740 (reprfunc)type_repr, /* tp_repr */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2741 0, /* tp_as_number */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2742 0, /* tp_as_sequence */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2743 0, /* tp_as_mapping */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2744 (hashfunc)_Py_HashPointer, /* tp_hash */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2745 (ternaryfunc)type_call, /* tp_call */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2746 0, /* tp_str */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2747 (getattrofunc)type_getattro, /* tp_getattro */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2748 (setattrofunc)type_setattro, /* tp_setattro */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2749 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
|
2750 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
|
2751 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
|
2752 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
|
2753 (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
|
2754 (inquiry)type_clear, /* tp_clear */ |
|
45860
50771a3fad2c
Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.
Steven Bethard <steven.bethard@gmail.com>
parents:
45543
diff
changeset
|
2755 type_richcompare, /* 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
|
2756 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
|
2757 0, /* tp_iter */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2758 0, /* tp_iternext */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2759 type_methods, /* tp_methods */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2760 type_members, /* tp_members */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2761 type_getsets, /* tp_getset */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2762 0, /* tp_base */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2763 0, /* tp_dict */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2764 0, /* tp_descr_get */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2765 0, /* tp_descr_set */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2766 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
|
2767 type_init, /* tp_init */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2768 0, /* tp_alloc */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2769 type_new, /* tp_new */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2770 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
|
2771 (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
|
2772 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2773 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2774 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2775 /* 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
|
2776 |
|
41281
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2777 /* 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
|
2778 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
|
2779 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2780 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
|
2781 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2782 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
|
2783 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
|
2784 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
|
2785 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2786 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
|
2787 __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
|
2788 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
|
2789 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
|
2790 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
|
2791 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2792 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
|
2793 __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
|
2794 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
|
2795 complaining. |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2796 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2797 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
|
2798 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
|
2799 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
|
2800 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2801 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
|
2802 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
|
2803 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
|
2804 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
|
2805 (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
|
2806 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
|
2807 __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
|
2808 (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
|
2809 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2810 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
|
2811 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
|
2812 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
|
2813 rules. |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2814 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2815 */ |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2816 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2817 /* Forward */ |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2818 static PyObject * |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2819 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
|
2820 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2821 static int |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2822 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
|
2823 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2824 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
|
2825 (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
|
2826 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2827 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2828 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2829 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
|
2830 { |
|
41281
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2831 int err = 0; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2832 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
|
2833 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
|
2834 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
|
2835 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
|
2836 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2837 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
|
2838 "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
|
2839 1); |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2840 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2841 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
|
2842 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
|
2843 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2844 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
|
2845 "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
|
2846 err = -1; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2847 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2848 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2849 return err; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2850 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2851 |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2852 static PyObject * |
|
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2853 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
|
2854 { |
|
41281
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2855 int err = 0; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2856 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
|
2857 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
|
2858 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
|
2859 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2860 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
|
2861 "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
|
2862 1); |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2863 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2864 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
|
2865 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
|
2866 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2867 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
|
2868 "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
|
2869 err = -1; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2870 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2871 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2872 if (err < 0) |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2873 return NULL; |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2874 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2875 if (type->tp_flags & Py_TPFLAGS_IS_ABSTRACT) { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2876 static PyObject *comma = NULL; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2877 PyObject *abstract_methods = NULL; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2878 PyObject *builtins; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2879 PyObject *sorted; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2880 PyObject *sorted_methods = NULL; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2881 PyObject *joined = NULL; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2882 const char *joined_str; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2883 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2884 /* Compute ", ".join(sorted(type.__abstractmethods__)) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2885 into joined. */ |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2886 abstract_methods = type_abstractmethods(type, NULL); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2887 if (abstract_methods == NULL) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2888 goto error; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2889 builtins = PyEval_GetBuiltins(); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2890 if (builtins == NULL) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2891 goto error; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2892 sorted = PyDict_GetItemString(builtins, "sorted"); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2893 if (sorted == NULL) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2894 goto error; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2895 sorted_methods = PyObject_CallFunctionObjArgs(sorted, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2896 abstract_methods, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2897 NULL); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2898 if (sorted_methods == NULL) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2899 goto error; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2900 if (comma == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2901 comma = PyString_InternFromString(", "); |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2902 if (comma == NULL) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2903 goto error; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2904 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2905 joined = PyObject_CallMethod(comma, "join", |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2906 "O", sorted_methods); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2907 if (joined == NULL) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2908 goto error; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2909 joined_str = PyString_AsString(joined); |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2910 if (joined_str == NULL) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2911 goto error; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2912 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2913 PyErr_Format(PyExc_TypeError, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2914 "Can't instantiate abstract class %s " |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2915 "with abstract methods %s", |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2916 type->tp_name, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2917 joined_str); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2918 error: |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2919 Py_XDECREF(joined); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2920 Py_XDECREF(sorted_methods); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2921 Py_XDECREF(abstract_methods); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2922 return NULL; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2923 } |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2924 return type->tp_alloc(type, 0); |
|
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2925 } |
|
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2926 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2927 static void |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2928 object_dealloc(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2929 { |
|
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
|
2930 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
|
2931 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2932 |
|
19194
7e9f5c59e9f2
Make dynamic types work as intended. Or at least more so.
Guido van Rossum <guido@python.org>
parents:
19192
diff
changeset
|
2933 static PyObject * |
|
7e9f5c59e9f2
Make dynamic types work as intended. Or at least more so.
Guido van Rossum <guido@python.org>
parents:
19192
diff
changeset
|
2934 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
|
2935 { |
|
19316
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2936 PyTypeObject *type; |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
2937 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
|
2938 |
|
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
|
2939 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
|
2940 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
|
2941 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
|
2942 PyErr_Clear(); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2943 else if (!PyString_Check(mod)) { |
|
19316
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2944 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
|
2945 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
|
2946 } |
|
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2947 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
|
2948 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
|
2949 return NULL; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2950 if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__")) |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2951 rtn = PyString_FromFormat("<%s.%s object at %p>", |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2952 PyString_AS_STRING(mod), |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2953 PyString_AS_STRING(name), |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
2954 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
|
2955 else |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
2956 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
|
2957 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
|
2958 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
|
2959 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
|
2960 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
|
2961 } |
|
7e9f5c59e9f2
Make dynamic types work as intended. Or at least more so.
Guido van Rossum <guido@python.org>
parents:
19192
diff
changeset
|
2962 |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2963 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2964 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
|
2965 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2966 unaryfunc f; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2967 |
|
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
|
2968 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
|
2969 if (f == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2970 f = object_repr; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2971 return f(self); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2972 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2973 |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2974 static PyObject * |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2975 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
|
2976 { |
|
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
|
2977 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
|
2978 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
|
2979 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2980 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2981 static int |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2982 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
|
2983 { |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2984 return a == b || |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2985 (a != NULL && |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2986 b != NULL && |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2987 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
|
2988 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
|
2989 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
|
2990 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
|
2991 ((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
|
2992 (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
|
2993 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2994 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2995 static int |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2996 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
|
2997 { |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2998 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
|
2999 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
|
3000 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
|
3001 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3002 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
|
3003 return 0; |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3004 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
|
3005 return 1; |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3006 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
|
3007 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
|
3008 size += sizeof(PyObject *); |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3009 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
|
3010 size += sizeof(PyObject *); |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
3011 |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
3012 /* Check slots compliance */ |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
3013 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
|
3014 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
|
3015 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
|
3016 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
|
3017 return 0; |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
3018 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
|
3019 } |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3020 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
|
3021 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3022 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3023 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
|
3024 compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, char* attr) |
| 26421 | 3025 { |
| 3026 PyTypeObject *newbase, *oldbase; | |
| 3027 | |
|
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
|
3028 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
|
3029 newto->tp_free != oldto->tp_free) |
| 26421 | 3030 { |
| 3031 PyErr_Format(PyExc_TypeError, | |
| 3032 "%s assignment: " | |
| 3033 "'%s' deallocator differs from '%s'", | |
| 3034 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
|
3035 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
|
3036 oldto->tp_name); |
| 26421 | 3037 return 0; |
| 3038 } | |
|
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
|
3039 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
|
3040 oldbase = oldto; |
| 26421 | 3041 while (equiv_structs(newbase, newbase->tp_base)) |
| 3042 newbase = newbase->tp_base; | |
| 3043 while (equiv_structs(oldbase, oldbase->tp_base)) | |
| 3044 oldbase = oldbase->tp_base; | |
| 3045 if (newbase != oldbase && | |
| 3046 (newbase->tp_base != oldbase->tp_base || | |
| 3047 !same_slots_added(newbase, oldbase))) { | |
| 3048 PyErr_Format(PyExc_TypeError, | |
| 3049 "%s assignment: " | |
| 3050 "'%s' object layout differs from '%s'", | |
| 3051 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
|
3052 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
|
3053 oldto->tp_name); |
| 26421 | 3054 return 0; |
| 3055 } | |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
3056 |
| 26421 | 3057 return 1; |
| 3058 } | |
| 3059 | |
| 3060 static int | |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3061 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
|
3062 { |
|
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
|
3063 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
|
3064 PyTypeObject *newto; |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3065 |
|
23037
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
3066 if (value == NULL) { |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
3067 PyErr_SetString(PyExc_TypeError, |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
3068 "can't delete __class__ attribute"); |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
3069 return -1; |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
3070 } |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3071 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
|
3072 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
|
3073 "__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
|
3074 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
|
3075 return -1; |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3076 } |
|
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
|
3077 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
|
3078 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
|
3079 !(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
|
3080 { |
|
3b8a707b41c4
Disallow class assignment completely unless both old and new are heap
Guido van Rossum <guido@python.org>
parents:
24685
diff
changeset
|
3081 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
|
3082 "__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
|
3083 return -1; |
|
3b8a707b41c4
Disallow class assignment completely unless both old and new are heap
Guido van Rossum <guido@python.org>
parents:
24685
diff
changeset
|
3084 } |
|
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
|
3085 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
|
3086 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
|
3087 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
|
3088 Py_DECREF(oldto); |
| 26421 | 3089 return 0; |
| 3090 } | |
| 3091 else { | |
|
23541
f6ded6efabcf
Add a safeguard against setting the class to something with a
Guido van Rossum <guido@python.org>
parents:
23127
diff
changeset
|
3092 return -1; |
|
f6ded6efabcf
Add a safeguard against setting the class to something with a
Guido van Rossum <guido@python.org>
parents:
23127
diff
changeset
|
3093 } |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3094 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3095 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3096 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
|
3097 {"__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
|
3098 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
|
3099 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3100 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3101 |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3102 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3103 /* Stuff to implement __reduce_ex__ for pickle protocols >= 2. |
|
47189
f419b2e96a98
Revert copy_reg -> copyreg rename.
Georg Brandl <georg@python.org>
parents:
47108
diff
changeset
|
3104 We fall back to helpers in copy_reg for: |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3105 - pickle protocols < 2 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3106 - 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
|
3107 - 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
|
3108 */ |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3109 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3110 static PyObject * |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3111 import_copyreg(void) |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3112 { |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3113 static PyObject *copyreg_str; |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3114 |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3115 if (!copyreg_str) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
3116 copyreg_str = PyString_InternFromString("copy_reg"); |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3117 if (copyreg_str == NULL) |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3118 return NULL; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3119 } |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3120 |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3121 return PyImport_Import(copyreg_str); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3122 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3123 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3124 static PyObject * |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3125 slotnames(PyObject *cls) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3126 { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3127 PyObject *clsdict; |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3128 PyObject *copyreg; |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3129 PyObject *slotnames; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3130 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3131 if (!PyType_Check(cls)) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3132 Py_INCREF(Py_None); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3133 return Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3134 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3135 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3136 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
|
3137 slotnames = PyDict_GetItemString(clsdict, "__slotnames__"); |
| 35637 | 3138 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
|
3139 Py_INCREF(slotnames); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3140 return slotnames; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3141 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3142 |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3143 copyreg = import_copyreg(); |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3144 if (copyreg == NULL) |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3145 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3146 |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3147 slotnames = PyObject_CallMethod(copyreg, "_slotnames", "O", cls); |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3148 Py_DECREF(copyreg); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3149 if (slotnames != NULL && |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3150 slotnames != Py_None && |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3151 !PyList_Check(slotnames)) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3152 { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3153 PyErr_SetString(PyExc_TypeError, |
|
47189
f419b2e96a98
Revert copy_reg -> copyreg rename.
Georg Brandl <georg@python.org>
parents:
47108
diff
changeset
|
3154 "copy_reg._slotnames didn't return a list or None"); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3155 Py_DECREF(slotnames); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3156 slotnames = NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3157 } |
|
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 return slotnames; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3160 } |
|
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 static PyObject * |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3163 reduce_2(PyObject *obj) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3164 { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3165 PyObject *cls, *getnewargs; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3166 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
|
3167 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
|
3168 PyObject *slots = NULL, *listitems = NULL, *dictitems = NULL; |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3169 PyObject *copyreg = NULL, *newobj = NULL, *res = NULL; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
3170 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
|
3171 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3172 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
|
3173 if (cls == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3174 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3175 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3176 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
|
3177 if (getnewargs != NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3178 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
|
3179 Py_DECREF(getnewargs); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3180 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
|
3181 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
|
3182 "__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
|
3183 "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
|
3184 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3185 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3186 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3187 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3188 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3189 args = PyTuple_New(0); |
|
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 if (args == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3192 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3193 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3194 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
|
3195 if (getstate != NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3196 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
|
3197 Py_DECREF(getstate); |
|
29382
585e303a9491
Fix SF #749831, copy raises SystemError when getstate raises exception
Neal Norwitz <nnorwitz@gmail.com>
parents:
29308
diff
changeset
|
3198 if (state == NULL) |
|
585e303a9491
Fix SF #749831, copy raises SystemError when getstate raises exception
Neal Norwitz <nnorwitz@gmail.com>
parents:
29308
diff
changeset
|
3199 goto end; |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3200 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3201 else { |
|
31477
ba9aaddeb956
Fixed a bug in object.__reduce_ex__ (reduce_2) when using protocol
Jim Fulton <jim@zope.com>
parents:
31176
diff
changeset
|
3202 PyErr_Clear(); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3203 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
|
3204 if (state == NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3205 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3206 state = Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3207 Py_INCREF(state); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3208 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3209 names = slotnames(cls); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3210 if (names == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3211 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3212 if (names != Py_None) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3213 assert(PyList_Check(names)); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3214 slots = PyDict_New(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3215 if (slots == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3216 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3217 n = 0; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3218 /* 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
|
3219 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
|
3220 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
|
3221 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
|
3222 PyObject *name, *value; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3223 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
|
3224 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
|
3225 if (value == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3226 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3227 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3228 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
|
3229 value); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3230 Py_DECREF(value); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3231 if (err) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3232 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3233 n++; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3234 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3235 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3236 if (n) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3237 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
|
3238 if (state == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3239 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3240 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3241 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3242 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3243 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3244 if (!PyList_Check(obj)) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3245 listitems = Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3246 Py_INCREF(listitems); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3247 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3248 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3249 listitems = PyObject_GetIter(obj); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3250 if (listitems == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3251 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3252 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3253 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3254 if (!PyDict_Check(obj)) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3255 dictitems = Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3256 Py_INCREF(dictitems); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3257 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3258 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3259 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
|
3260 if (dictitems == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3261 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3262 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3263 |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3264 copyreg = import_copyreg(); |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3265 if (copyreg == NULL) |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3266 goto end; |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3267 newobj = PyObject_GetAttrString(copyreg, "__newobj__"); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3268 if (newobj == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3269 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3270 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3271 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
|
3272 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
|
3273 if (args2 == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3274 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3275 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
|
3276 cls = NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3277 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
|
3278 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
|
3279 Py_INCREF(v); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3280 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
|
3281 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3282 |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
3283 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
|
3284 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3285 end: |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3286 Py_XDECREF(cls); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3287 Py_XDECREF(args); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3288 Py_XDECREF(args2); |
| 28566 | 3289 Py_XDECREF(slots); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3290 Py_XDECREF(state); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3291 Py_XDECREF(names); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3292 Py_XDECREF(listitems); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3293 Py_XDECREF(dictitems); |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3294 Py_XDECREF(copyreg); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3295 Py_XDECREF(newobj); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3296 return res; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3297 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3298 |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3299 /* |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3300 * 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
|
3301 * 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
|
3302 * - 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
|
3303 * 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
|
3304 * 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
|
3305 * - 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
|
3306 * __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
|
3307 * 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
|
3308 * |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3309 * 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
|
3310 * 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
|
3311 * 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
|
3312 * function. |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3313 */ |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3314 static PyObject * |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3315 _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
|
3316 { |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3317 PyObject *copyreg, *res; |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3318 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3319 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
|
3320 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
|
3321 |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3322 copyreg = import_copyreg(); |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3323 if (!copyreg) |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3324 return NULL; |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3325 |
|
46865
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3326 res = PyEval_CallMethod(copyreg, "_reduce_ex", "(Oi)", self, proto); |
|
b40827eb4b80
Added module stub for copy_reg renaming in 3.0.
Alexandre Vassalotti <alexandre@peadrop.com>
parents:
46573
diff
changeset
|
3327 Py_DECREF(copyreg); |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3328 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3329 return res; |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3330 } |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3331 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3332 static PyObject * |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3333 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
|
3334 { |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3335 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
|
3336 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3337 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
|
3338 return NULL; |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3339 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3340 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
|
3341 } |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3342 |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3343 static PyObject * |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3344 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
|
3345 { |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3346 PyObject *reduce, *res; |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3347 int proto = 0; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3348 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3349 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
|
3350 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3351 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3352 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
|
3353 if (reduce == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3354 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3355 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3356 PyObject *cls, *clsreduce, *objreduce; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3357 int override; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3358 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
|
3359 if (cls == NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3360 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3361 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3362 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3363 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
|
3364 Py_DECREF(cls); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3365 if (clsreduce == NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3366 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3367 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3368 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3369 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
|
3370 "__reduce__"); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3371 override = (clsreduce != objreduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3372 Py_DECREF(clsreduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3373 if (override) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3374 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
|
3375 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3376 return res; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3377 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3378 else |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3379 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3380 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3381 |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3382 return _common_reduce(self, proto); |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3383 } |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3384 |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3385 static PyObject * |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3386 object_subclasshook(PyObject *cls, PyObject *args) |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3387 { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3388 Py_INCREF(Py_NotImplemented); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3389 return Py_NotImplemented; |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3390 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3391 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3392 PyDoc_STRVAR(object_subclasshook_doc, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3393 "Abstract classes can override this to customize issubclass().\n" |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3394 "\n" |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3395 "This is invoked early on by abc.ABCMeta.__subclasscheck__().\n" |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3396 "It should return True, False or NotImplemented. If it returns\n" |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3397 "NotImplemented, the normal algorithm is used. Otherwise, it\n" |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3398 "overrides the normal algorithm (and the outcome is cached).\n"); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3399 |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3400 /* |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3401 from PEP 3101, this code implements: |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3402 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3403 class object: |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3404 def __format__(self, format_spec): |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3405 if isinstance(format_spec, str): |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3406 return format(str(self), format_spec) |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3407 elif isinstance(format_spec, unicode): |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3408 return format(unicode(self), format_spec) |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3409 */ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3410 static PyObject * |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3411 object_format(PyObject *self, PyObject *args) |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3412 { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3413 PyObject *format_spec; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3414 PyObject *self_as_str = NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3415 PyObject *result = NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3416 PyObject *format_meth = NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3417 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3418 if (!PyArg_ParseTuple(args, "O:__format__", &format_spec)) |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3419 return NULL; |
|
51032
551257c8058a
fix building the core with --disable-unicode
Benjamin Peterson <benjamin@python.org>
parents:
50828
diff
changeset
|
3420 #ifdef Py_USING_UNICODE |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3421 if (PyUnicode_Check(format_spec)) { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3422 self_as_str = PyObject_Unicode(self); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
3423 } else if (PyString_Check(format_spec)) { |
|
51032
551257c8058a
fix building the core with --disable-unicode
Benjamin Peterson <benjamin@python.org>
parents:
50828
diff
changeset
|
3424 #else |
|
551257c8058a
fix building the core with --disable-unicode
Benjamin Peterson <benjamin@python.org>
parents:
50828
diff
changeset
|
3425 if (PyString_Check(format_spec)) { |
|
551257c8058a
fix building the core with --disable-unicode
Benjamin Peterson <benjamin@python.org>
parents:
50828
diff
changeset
|
3426 #endif |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3427 self_as_str = PyObject_Str(self); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3428 } else { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3429 PyErr_SetString(PyExc_TypeError, "argument to __format__ must be unicode or str"); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3430 return NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3431 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3432 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3433 if (self_as_str != NULL) { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3434 /* find the format function */ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3435 format_meth = PyObject_GetAttrString(self_as_str, "__format__"); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3436 if (format_meth != NULL) { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3437 /* and call it */ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3438 result = PyObject_CallFunctionObjArgs(format_meth, format_spec, NULL); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3439 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3440 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3441 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3442 Py_XDECREF(self_as_str); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3443 Py_XDECREF(format_meth); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3444 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3445 return result; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3446 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3447 |
|
47419
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3448 static PyObject * |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3449 object_sizeof(PyObject *self, PyObject *args) |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3450 { |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3451 Py_ssize_t res, isize; |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3452 |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3453 res = 0; |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3454 isize = self->ob_type->tp_itemsize; |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3455 if (isize > 0) |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3456 res = self->ob_type->ob_size * isize; |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3457 res += self->ob_type->tp_basicsize; |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3458 |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3459 return PyInt_FromSsize_t(res); |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3460 } |
|
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3461 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3462 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
|
3463 {"__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
|
3464 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
|
3465 {"__reduce__", object_reduce, METH_VARARGS, |
|
24795
452d6a916196
Allow more docstrings to be removed during compilation
Neal Norwitz <nnorwitz@gmail.com>
parents:
24789
diff
changeset
|
3466 PyDoc_STR("helper for pickle")}, |
|
45543
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3467 {"__subclasshook__", object_subclasshook, METH_CLASS | METH_VARARGS, |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3468 object_subclasshook_doc}, |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3469 {"__format__", object_format, METH_VARARGS, |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3470 PyDoc_STR("default object formatter")}, |
|
47419
88bd07c0a847
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
Robert Schuppenies <okkotonushi@googlemail.com>
parents:
47371
diff
changeset
|
3471 {"__sizeof__", object_sizeof, METH_NOARGS, |
|
47421
a65f095b27f3
Some style nits. Also clarify in the docstrings what __sizeof__ does.
Georg Brandl <georg@python.org>
parents:
47419
diff
changeset
|
3472 PyDoc_STR("__sizeof__() -> size of object in memory, in bytes")}, |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3473 {0} |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3474 }; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3475 |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3476 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3477 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
|
3478 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
|
3479 "object", /* tp_name */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3480 sizeof(PyObject), /* tp_basicsize */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3481 0, /* tp_itemsize */ |
|
37304
79a0f080f898
Remove unnecessary casts in type object initializers.
Georg Brandl <georg@python.org>
parents:
37067
diff
changeset
|
3482 object_dealloc, /* tp_dealloc */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3483 0, /* tp_print */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3484 0, /* tp_getattr */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3485 0, /* tp_setattr */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3486 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
|
3487 object_repr, /* tp_repr */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3488 0, /* tp_as_number */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3489 0, /* tp_as_sequence */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3490 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
|
3491 (hashfunc)_Py_HashPointer, /* tp_hash */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3492 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
|
3493 object_str, /* tp_str */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3494 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
|
3495 PyObject_GenericSetAttr, /* tp_setattro */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3496 0, /* tp_as_buffer */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3497 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
|
3498 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
|
3499 0, /* tp_traverse */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3500 0, /* tp_clear */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3501 0, /* tp_richcompare */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3502 0, /* tp_weaklistoffset */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3503 0, /* tp_iter */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3504 0, /* tp_iternext */ |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3505 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
|
3506 0, /* tp_members */ |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3507 object_getsets, /* tp_getset */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3508 0, /* tp_base */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3509 0, /* tp_dict */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3510 0, /* tp_descr_get */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3511 0, /* tp_descr_set */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3512 0, /* tp_dictoffset */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3513 object_init, /* tp_init */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3514 PyType_GenericAlloc, /* tp_alloc */ |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
3515 object_new, /* tp_new */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3516 PyObject_Del, /* tp_free */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3517 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3518 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3519 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3520 /* 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
|
3521 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3522 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3523 add_methods(PyTypeObject *type, PyMethodDef *meth) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3524 { |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3525 PyObject *dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3526 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3527 for (; meth->ml_name != NULL; meth++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3528 PyObject *descr; |
|
31172
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
30917
diff
changeset
|
3529 if (PyDict_GetItemString(dict, meth->ml_name) && |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
30917
diff
changeset
|
3530 !(meth->ml_flags & METH_COEXIST)) |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
30917
diff
changeset
|
3531 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
|
3532 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
|
3533 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
|
3534 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
|
3535 "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
|
3536 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
|
3537 } |
|
26583
8991f78817c7
SF 548651: Fix the METH_CLASS implementation.
Tim Peters <tim.peters@gmail.com>
parents:
26575
diff
changeset
|
3538 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
|
3539 } |
|
ddc9543c76a0
Introduce two new flag bits that can be set in a PyMethodDef method
Fred Drake <fdrake@acm.org>
parents:
22348
diff
changeset
|
3540 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
|
3541 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
|
3542 if (cfunc == NULL) |
|
48dc4a59a50e
Inline create_specialmethod() -- since METH_CLASS is done differently
Guido van Rossum <guido@python.org>
parents:
27811
diff
changeset
|
3543 return -1; |
|
48dc4a59a50e
Inline create_specialmethod() -- since METH_CLASS is done differently
Guido van Rossum <guido@python.org>
parents:
27811
diff
changeset
|
3544 descr = PyStaticMethod_New(cfunc); |
|
48dc4a59a50e
Inline create_specialmethod() -- since METH_CLASS is done differently
Guido van Rossum <guido@python.org>
parents:
27811
diff
changeset
|
3545 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
|
3546 } |
|
ddc9543c76a0
Introduce two new flag bits that can be set in a PyMethodDef method
Fred Drake <fdrake@acm.org>
parents:
22348
diff
changeset
|
3547 else { |
|
ddc9543c76a0
Introduce two new flag bits that can be set in a PyMethodDef method
Fred Drake <fdrake@acm.org>
parents:
22348
diff
changeset
|
3548 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
|
3549 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3550 if (descr == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3551 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
|
3552 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
|
3553 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3554 Py_DECREF(descr); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3555 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3556 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3557 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3558 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3559 static int |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
3560 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
|
3561 { |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3562 PyObject *dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3563 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3564 for (; memb->name != NULL; memb++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3565 PyObject *descr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3566 if (PyDict_GetItemString(dict, memb->name)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3567 continue; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3568 descr = PyDescr_NewMember(type, memb); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3569 if (descr == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3570 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3571 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
|
3572 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3573 Py_DECREF(descr); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3574 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3575 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3576 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3577 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3578 static int |
|
20015
ca7af2a5d915
Add optional docstrings to getset descriptors. Fortunately, there's
Guido van Rossum <guido@python.org>
parents:
20012
diff
changeset
|
3579 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
|
3580 { |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3581 PyObject *dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3582 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3583 for (; gsp->name != NULL; gsp++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3584 PyObject *descr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3585 if (PyDict_GetItemString(dict, gsp->name)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3586 continue; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3587 descr = PyDescr_NewGetSet(type, gsp); |
|
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 (descr == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3590 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3591 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
|
3592 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3593 Py_DECREF(descr); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3594 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3595 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3596 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3597 |
|
52749
75efd757434b
Issue #2396: backport the memoryview object.
Antoine Pitrou <solipsis@pitrou.net>
parents:
52176
diff
changeset
|
3598 #define BUFFER_FLAGS (Py_TPFLAGS_HAVE_GETCHARBUFFER | Py_TPFLAGS_HAVE_NEWBUFFER) |
|
75efd757434b
Issue #2396: backport the memoryview object.
Antoine Pitrou <solipsis@pitrou.net>
parents:
52176
diff
changeset
|
3599 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3600 static void |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3601 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
|
3602 { |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
3603 Py_ssize_t oldsize, newsize; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3604 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3605 /* 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
|
3606 if (!type->tp_as_buffer && base->tp_as_buffer) { |
|
52749
75efd757434b
Issue #2396: backport the memoryview object.
Antoine Pitrou <solipsis@pitrou.net>
parents:
52176
diff
changeset
|
3607 type->tp_flags &= ~BUFFER_FLAGS; |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3608 type->tp_flags |= |
|
52749
75efd757434b
Issue #2396: backport the memoryview object.
Antoine Pitrou <solipsis@pitrou.net>
parents:
52176
diff
changeset
|
3609 base->tp_flags & BUFFER_FLAGS; |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3610 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3611 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
|
3612 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
|
3613 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
|
3614 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3615 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
|
3616 (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
|
3617 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
|
3618 (!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
|
3619 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
|
3620 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
|
3621 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
|
3622 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
|
3623 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3624 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3625 /* Wow */ |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3626 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3627 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
|
3628 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
|
3629 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
|
3630 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3631 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3632 /* 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
|
3633 oldsize = base->tp_basicsize; |
|
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
3634 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
|
3635 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
|
3636 (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
|
3637 (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
|
3638 (!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
|
3639 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
|
3640 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
|
3641 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
|
3642 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
|
3643 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
|
3644 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3645 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
|
3646 /* 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
|
3647 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
|
3648 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
|
3649 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
|
3650 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
|
3651 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
|
3652 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
|
3653 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
|
3654 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
|
3655 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
|
3656 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
|
3657 (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
|
3658 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
|
3659 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
|
3660 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3661 } |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
3662 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
|
3663 |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3664 /* 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
|
3665 |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3666 #undef COPYVAL |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3667 #define COPYVAL(SLOT) \ |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3668 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
|
3669 |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3670 COPYVAL(tp_itemsize); |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3671 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
|
3672 COPYVAL(tp_weaklistoffset); |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3673 } |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3674 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
|
3675 COPYVAL(tp_dictoffset); |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3676 } |
|
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
|
3677 |
|
d01bd37bf5ce
Variation of patch # 1624059 to speed up checking if an object is a subclass
Neal Norwitz <nnorwitz@gmail.com>
parents:
40777
diff
changeset
|
3678 /* 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
|
3679 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
|
3680 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
|
3681 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
|
3682 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
|
3683 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
|
3684 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
|
3685 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
|
3686 type->tp_flags |= Py_TPFLAGS_LONG_SUBCLASS; |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
3687 else if (PyType_IsSubtype(base, &PyString_Type)) |
|
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
|
3688 type->tp_flags |= Py_TPFLAGS_STRING_SUBCLASS; |
|
44572
db5e01c33eb7
Make Python compile with --disable-unicode.
Georg Brandl <georg@python.org>
parents:
44365
diff
changeset
|
3689 #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
|
3690 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
|
3691 type->tp_flags |= Py_TPFLAGS_UNICODE_SUBCLASS; |
|
44572
db5e01c33eb7
Make Python compile with --disable-unicode.
Georg Brandl <georg@python.org>
parents:
44365
diff
changeset
|
3692 #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
|
3693 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
|
3694 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
|
3695 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
|
3696 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
|
3697 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
|
3698 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
|
3699 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3700 |
|
48213
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3701 static int |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3702 overrides_name(PyTypeObject *type, char *name) |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3703 { |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3704 PyObject *dict = type->tp_dict; |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3705 |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3706 assert(dict != NULL); |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3707 if (PyDict_GetItemString(dict, name) != NULL) { |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3708 return 1; |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3709 } |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3710 return 0; |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3711 } |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3712 |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3713 #define OVERRIDES_HASH(x) overrides_name(x, "__hash__") |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3714 #define OVERRIDES_CMP(x) overrides_name(x, "__cmp__") |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3715 #define OVERRIDES_EQ(x) overrides_name(x, "__eq__") |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3716 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3717 static void |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3718 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
|
3719 { |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3720 PyTypeObject *basebase; |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3721 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3722 #undef SLOTDEFINED |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3723 #undef COPYSLOT |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3724 #undef COPYNUM |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3725 #undef COPYSEQ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3726 #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
|
3727 #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
|
3728 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3729 #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
|
3730 (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
|
3731 (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
|
3732 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3733 #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
|
3734 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
|
3735 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3736 #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
|
3737 #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
|
3738 #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
|
3739 #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
|
3740 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3741 /* 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
|
3742 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
|
3743 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3744 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
|
3745 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
|
3746 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
|
3747 basebase = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3748 COPYNUM(nb_add); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3749 COPYNUM(nb_subtract); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3750 COPYNUM(nb_multiply); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3751 COPYNUM(nb_divide); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3752 COPYNUM(nb_remainder); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3753 COPYNUM(nb_divmod); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3754 COPYNUM(nb_power); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3755 COPYNUM(nb_negative); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3756 COPYNUM(nb_positive); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3757 COPYNUM(nb_absolute); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3758 COPYNUM(nb_nonzero); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3759 COPYNUM(nb_invert); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3760 COPYNUM(nb_lshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3761 COPYNUM(nb_rshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3762 COPYNUM(nb_and); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3763 COPYNUM(nb_xor); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3764 COPYNUM(nb_or); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3765 COPYNUM(nb_coerce); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3766 COPYNUM(nb_int); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3767 COPYNUM(nb_long); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3768 COPYNUM(nb_float); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3769 COPYNUM(nb_oct); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3770 COPYNUM(nb_hex); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3771 COPYNUM(nb_inplace_add); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3772 COPYNUM(nb_inplace_subtract); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3773 COPYNUM(nb_inplace_multiply); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3774 COPYNUM(nb_inplace_divide); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3775 COPYNUM(nb_inplace_remainder); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3776 COPYNUM(nb_inplace_power); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3777 COPYNUM(nb_inplace_lshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3778 COPYNUM(nb_inplace_rshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3779 COPYNUM(nb_inplace_and); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3780 COPYNUM(nb_inplace_xor); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3781 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
|
3782 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
|
3783 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
|
3784 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
|
3785 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
|
3786 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
|
3787 } |
|
36882
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
3788 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
|
3789 COPYNUM(nb_index); |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
3790 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3791 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3792 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3793 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
|
3794 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
|
3795 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
|
3796 basebase = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3797 COPYSEQ(sq_length); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3798 COPYSEQ(sq_concat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3799 COPYSEQ(sq_repeat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3800 COPYSEQ(sq_item); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3801 COPYSEQ(sq_slice); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3802 COPYSEQ(sq_ass_item); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3803 COPYSEQ(sq_ass_slice); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3804 COPYSEQ(sq_contains); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3805 COPYSEQ(sq_inplace_concat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3806 COPYSEQ(sq_inplace_repeat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3807 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3808 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3809 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
|
3810 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
|
3811 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
|
3812 basebase = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3813 COPYMAP(mp_length); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3814 COPYMAP(mp_subscript); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3815 COPYMAP(mp_ass_subscript); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3816 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3817 |
|
20384
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3818 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
|
3819 basebase = base->tp_base; |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3820 if (basebase->tp_as_buffer == NULL) |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3821 basebase = NULL; |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3822 COPYBUF(bf_getreadbuffer); |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3823 COPYBUF(bf_getwritebuffer); |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3824 COPYBUF(bf_getsegcount); |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3825 COPYBUF(bf_getcharbuffer); |
|
46107
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46075
diff
changeset
|
3826 COPYBUF(bf_getbuffer); |
|
5341b30b1812
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
46075
diff
changeset
|
3827 COPYBUF(bf_releasebuffer); |
|
20384
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3828 } |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3829 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3830 basebase = base->tp_base; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3831 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3832 COPYSLOT(tp_dealloc); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3833 COPYSLOT(tp_print); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3834 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
|
3835 type->tp_getattr = base->tp_getattr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3836 type->tp_getattro = base->tp_getattro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3837 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3838 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
|
3839 type->tp_setattr = base->tp_setattr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3840 type->tp_setattro = base->tp_setattro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3841 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3842 /* tp_compare see tp_richcompare */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3843 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
|
3844 /* tp_hash see tp_richcompare */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3845 COPYSLOT(tp_call); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3846 COPYSLOT(tp_str); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3847 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
|
3848 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
|
3849 type->tp_richcompare == NULL && |
|
47961
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
3850 type->tp_hash == NULL) |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
3851 { |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3852 type->tp_compare = base->tp_compare; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3853 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
|
3854 type->tp_hash = base->tp_hash; |
|
48213
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3855 /* Check for changes to inherited methods in Py3k*/ |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3856 if (Py_Py3kWarningFlag) { |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3857 if (base->tp_hash && |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3858 (base->tp_hash != PyObject_HashNotImplemented) && |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3859 !OVERRIDES_HASH(type)) { |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3860 if (OVERRIDES_CMP(type)) { |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3861 PyErr_WarnPy3k("Overriding " |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3862 "__cmp__ blocks inheritance " |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3863 "of __hash__ in 3.x", |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3864 1); |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3865 } |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3866 if (OVERRIDES_EQ(type)) { |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3867 PyErr_WarnPy3k("Overriding " |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3868 "__eq__ blocks inheritance " |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3869 "of __hash__ in 3.x", |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3870 1); |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3871 } |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3872 } |
|
7527da2b05e8
Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.
Nick Coghlan <ncoghlan@gmail.com>
parents:
47961
diff
changeset
|
3873 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3874 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3875 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3876 else { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3877 COPYSLOT(tp_compare); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3878 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3879 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
|
3880 COPYSLOT(tp_iter); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3881 COPYSLOT(tp_iternext); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3882 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3883 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
|
3884 COPYSLOT(tp_descr_get); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3885 COPYSLOT(tp_descr_set); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3886 COPYSLOT(tp_dictoffset); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3887 COPYSLOT(tp_init); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3888 COPYSLOT(tp_alloc); |
|
22848
e589e473f232
Inherit tp_new and tp_is_gc.
Guido van Rossum <guido@python.org>
parents:
22834
diff
changeset
|
3889 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
|
3890 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
|
3891 (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
|
3892 /* 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
|
3893 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
|
3894 } |
|
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
|
3895 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
|
3896 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
|
3897 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
|
3898 /* 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
|
3899 * 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
|
3900 * 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
|
3901 * 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
|
3902 */ |
|
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
|
3903 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
|
3904 } |
|
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
|
3905 /* 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
|
3906 * 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
|
3907 */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3908 } |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3909 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3910 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
3911 static int add_operators(PyTypeObject *); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3912 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3913 int |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
3914 PyType_Ready(PyTypeObject *type) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3915 { |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
3916 PyObject *dict, *bases; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3917 PyTypeObject *base; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
3918 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3919 |
|
23756
8e5f26796620
Undo the last chunk of the previous patch, putting back a useful
Guido van Rossum <guido@python.org>
parents:
23755
diff
changeset
|
3920 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
|
3921 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
|
3922 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
|
3923 } |
|
19136
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
3924 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
|
3925 |
|
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
3926 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
|
3927 |
|
28389
4ede57a42c62
Refactored some of the Py_TRACE_REFS code. New private API function
Tim Peters <tim.peters@gmail.com>
parents:
28288
diff
changeset
|
3928 #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
|
3929 /* 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
|
3930 * 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
|
3931 * 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
|
3932 * 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
|
3933 */ |
|
28396
d56282c28a1e
Improved new Py_TRACE_REFS gimmicks.
Tim Peters <tim.peters@gmail.com>
parents:
28390
diff
changeset
|
3934 _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
|
3935 #endif |
|
4ede57a42c62
Refactored some of the Py_TRACE_REFS code. New private API function
Tim Peters <tim.peters@gmail.com>
parents:
28288
diff
changeset
|
3936 |
|
22871
252438bb05d9
- A type can now inherit its metatype from its base type. Previously,
Guido van Rossum <guido@python.org>
parents:
22859
diff
changeset
|
3937 /* 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
|
3938 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
|
3939 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
|
3940 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
|
3941 Py_INCREF(base); |
|
f6fa649fc4af
Patch #980082: Missing INCREF in PyType_Ready.
Martin v. Löwis <martin@v.loewis.de>
parents:
32916
diff
changeset
|
3942 } |
|
22871
252438bb05d9
- A type can now inherit its metatype from its base type. Previously,
Guido van Rossum <guido@python.org>
parents:
22859
diff
changeset
|
3943 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3944 /* 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
|
3945 * &PyBaseObject_Type. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3946 */ |
|
36925
7c17e9221f94
Fix three nits found by Coverity, adding null checks and comments.
Guido van Rossum <guido@python.org>
parents:
36882
diff
changeset
|
3947 |
|
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
|
3948 /* 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
|
3949 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
|
3950 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
|
3951 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
|
3952 } |
|
c001e5a15369
PyType_Ready(): initialize the base class a bit earlier, so that if we
Guido van Rossum <guido@python.org>
parents:
24795
diff
changeset
|
3953 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3954 /* 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
|
3955 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
|
3956 initializing the ob_type field of their type objects. */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3957 /* 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
|
3958 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
|
3959 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
|
3960 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
|
3961 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
|
3962 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
|
3963 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3964 /* Initialize tp_bases */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3965 bases = type->tp_bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3966 if (bases == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3967 if (base == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3968 bases = PyTuple_New(0); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3969 else |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
3970 bases = PyTuple_Pack(1, base); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3971 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
|
3972 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3973 type->tp_bases = bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3974 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3975 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3976 /* 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
|
3977 dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3978 if (dict == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3979 dict = PyDict_New(); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3980 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
|
3981 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
|
3982 type->tp_dict = dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3983 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3984 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3985 /* 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
|
3986 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
|
3987 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3988 if (type->tp_methods != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3989 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
|
3990 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3991 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3992 if (type->tp_members != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3993 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
|
3994 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3995 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3996 if (type->tp_getset != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3997 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
|
3998 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3999 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4000 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4001 /* Calculate method resolution order */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4002 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
|
4003 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4004 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4005 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
4006 /* 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
|
4007 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
|
4008 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
|
4009 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4010 /* Initialize tp_dict properly */ |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
4011 bases = type->tp_mro; |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
4012 assert(bases != NULL); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
4013 assert(PyTuple_Check(bases)); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
4014 n = PyTuple_GET_SIZE(bases); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
4015 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
|
4016 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
|
4017 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
|
4018 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
|
4019 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4020 |
|
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
|
4021 /* 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
|
4022 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
|
4023 (type->tp_free == NULL || type->tp_free == PyObject_Del)) { |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4024 /* 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
|
4025 * one, or its tp_free is for non-gc'ed objects. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4026 */ |
|
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
|
4027 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
|
4028 "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
|
4029 "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
|
4030 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
|
4031 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
|
4032 } |
|
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
|
4033 |
|
21997
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4034 /* 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
|
4035 the tp_doc slot. |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4036 */ |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4037 if (PyDict_GetItemString(type->tp_dict, "__doc__") == NULL) { |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4038 if (type->tp_doc != NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
4039 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
|
4040 if (doc == NULL) |
|
f2031f15d99d
Handle allocation failures gracefully. Found with failmalloc.
Neal Norwitz <nnorwitz@gmail.com>
parents:
38919
diff
changeset
|
4041 goto error; |
|
21997
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4042 PyDict_SetItemString(type->tp_dict, "__doc__", doc); |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4043 Py_DECREF(doc); |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4044 } else { |
|
22774
02fddf7c25c2
Fold some long lines. Delete blank initial line.
Guido van Rossum <guido@python.org>
parents:
22770
diff
changeset
|
4045 PyDict_SetItemString(type->tp_dict, |
|
02fddf7c25c2
Fold some long lines. Delete blank initial line.
Guido van Rossum <guido@python.org>
parents:
22770
diff
changeset
|
4046 "__doc__", Py_None); |
|
21997
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4047 } |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4048 } |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
4049 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
4050 /* 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
|
4051 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
|
4052 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
|
4053 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
|
4054 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
|
4055 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
|
4056 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
|
4057 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
|
4058 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
|
4059 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
|
4060 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
|
4061 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4062 |
|
20315
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
4063 /* 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
|
4064 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
|
4065 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
|
4066 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
|
4067 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
|
4068 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
|
4069 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
|
4070 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
|
4071 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
4072 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
4073 /* 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
|
4074 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
|
4075 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
|
4076 (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
|
4077 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
|
4078 |
|
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
4079 error: |
|
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
4080 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
|
4081 return -1; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4082 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4083 |
|
20315
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
4084 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
|
4085 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
|
4086 { |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
4087 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
|
4088 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
|
4089 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
|
4090 |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
4091 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
|
4092 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
|
4093 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
|
4094 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
|
4095 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
|
4096 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
4097 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
|
4098 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
|
4099 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
|
4100 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
|
4101 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
|
4102 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
|
4103 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
|
4104 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
|
4105 } |
|
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
|
4106 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
|
4107 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
|
4108 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
|
4109 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
4110 |
| 26421 | 4111 static void |
| 4112 remove_subclass(PyTypeObject *base, PyTypeObject *type) | |
| 4113 { | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4114 Py_ssize_t i; |
| 26421 | 4115 PyObject *list, *ref; |
| 4116 | |
| 4117 list = base->tp_subclasses; | |
| 4118 if (list == NULL) { | |
| 4119 return; | |
| 4120 } | |
| 4121 assert(PyList_Check(list)); | |
| 4122 i = PyList_GET_SIZE(list); | |
| 4123 while (--i >= 0) { | |
| 4124 ref = PyList_GET_ITEM(list, i); | |
| 4125 assert(PyWeakref_CheckRef(ref)); | |
| 4126 if (PyWeakref_GET_OBJECT(ref) == (PyObject*)type) { | |
| 4127 /* this can't fail, right? */ | |
| 4128 PySequence_DelItem(list, i); | |
| 4129 return; | |
| 4130 } | |
| 4131 } | |
| 4132 } | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4133 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4134 static int |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4135 check_num_args(PyObject *ob, int n) |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4136 { |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4137 if (!PyTuple_CheckExact(ob)) { |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4138 PyErr_SetString(PyExc_SystemError, |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4139 "PyArg_UnpackTuple() argument list is not a tuple"); |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4140 return 0; |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4141 } |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4142 if (n == PyTuple_GET_SIZE(ob)) |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4143 return 1; |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4144 PyErr_Format( |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4145 PyExc_TypeError, |
|
36510
0f3894bb2ada
Support %zd in PyErr_Format and PyString_FromFormat.
Martin v. Löwis <martin@v.loewis.de>
parents:
36501
diff
changeset
|
4146 "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
|
4147 return 0; |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4148 } |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4149 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4150 /* 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
|
4151 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4152 /* 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
|
4153 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
|
4154 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
|
4155 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
|
4156 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
|
4157 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4158 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4159 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
|
4160 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4161 lenfunc func = (lenfunc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4162 Py_ssize_t res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4163 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4164 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
|
4165 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4166 res = (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4167 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4168 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4169 return PyInt_FromLong((long)res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4170 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4171 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4172 static PyObject * |
|
30670
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4173 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
|
4174 { |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4175 inquiry func = (inquiry)wrapped; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4176 int res; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4177 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4178 if (!check_num_args(args, 0)) |
|
30670
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4179 return NULL; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4180 res = (*func)(self); |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4181 if (res == -1 && PyErr_Occurred()) |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4182 return NULL; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4183 return PyBool_FromLong((long)res); |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4184 } |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4185 |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4186 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4187 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
|
4188 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4189 binaryfunc func = (binaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4190 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4191 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4192 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
|
4193 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4194 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
|
4195 return (*func)(self, other); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4196 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4197 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4198 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
|
4199 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
|
4200 { |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4201 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
|
4202 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
|
4203 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4204 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
|
4205 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4206 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
|
4207 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
|
4208 !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
|
4209 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
|
4210 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
|
4211 } |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4212 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
|
4213 } |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4214 |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4215 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4216 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
|
4217 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4218 binaryfunc func = (binaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4219 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4220 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4221 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
|
4222 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4223 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
|
4224 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
|
4225 !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
|
4226 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
|
4227 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
|
4228 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4229 return (*func)(other, self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4230 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4231 |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4232 static PyObject * |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4233 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
|
4234 { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4235 coercion func = (coercion)wrapped; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4236 PyObject *other, *res; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4237 int ok; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4238 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4239 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
|
4240 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4241 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
|
4242 ok = func(&self, &other); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4243 if (ok < 0) |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4244 return NULL; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4245 if (ok > 0) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4246 Py_INCREF(Py_NotImplemented); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4247 return Py_NotImplemented; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4248 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4249 res = PyTuple_New(2); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4250 if (res == NULL) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4251 Py_DECREF(self); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4252 Py_DECREF(other); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4253 return NULL; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4254 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4255 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
|
4256 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
|
4257 return res; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4258 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4259 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4260 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4261 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
|
4262 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4263 ternaryfunc func = (ternaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4264 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4265 PyObject *third = Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4266 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4267 /* 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
|
4268 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4269 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
|
4270 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4271 return (*func)(self, other, third); |
|
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 |
|
20168
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4274 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
|
4275 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
|
4276 { |
|
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4277 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
|
4278 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
|
4279 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
|
4280 |
|
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4281 /* 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
|
4282 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4283 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
|
4284 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
|
4285 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
|
4286 } |
|
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4287 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4288 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4289 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
|
4290 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4291 unaryfunc func = (unaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4292 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4293 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
|
4294 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4295 return (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4296 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4297 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4298 static PyObject * |
|
37308
aaa04bfafc58
Minor bugs in the __index__ code (PEP 357), with tests.
Armin Rigo <arigo@tunes.org>
parents:
37304
diff
changeset
|
4299 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
|
4300 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4301 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
|
4302 PyObject* o; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4303 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4304 |
|
37308
aaa04bfafc58
Minor bugs in the __index__ code (PEP 357), with tests.
Armin Rigo <arigo@tunes.org>
parents:
37304
diff
changeset
|
4305 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
|
4306 return NULL; |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
4307 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
|
4308 if (i == -1 && PyErr_Occurred()) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4309 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4310 return (*func)(self, i); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4311 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4312 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4313 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
|
4314 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
|
4315 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4316 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4317 |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
4318 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
|
4319 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
|
4320 return -1; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4321 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
|
4322 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
|
4323 if (sq && sq->sq_length) { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4324 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
|
4325 if (n < 0) |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4326 return -1; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4327 i += n; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4328 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4329 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4330 return i; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4331 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4332 |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4333 static PyObject * |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4334 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
|
4335 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4336 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
|
4337 PyObject *arg; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4338 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
|
4339 |
|
20229
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4340 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
|
4341 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
|
4342 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
|
4343 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
|
4344 return NULL; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4345 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
|
4346 } |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4347 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
|
4348 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
|
4349 return NULL; |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4350 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4351 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4352 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4353 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
|
4354 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4355 ssizessizeargfunc func = (ssizessizeargfunc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4356 Py_ssize_t i, j; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4357 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4358 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
|
4359 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4360 return (*func)(self, i, j); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4361 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4362 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4363 static PyObject * |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4364 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
|
4365 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4366 ssizeobjargproc func = (ssizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4367 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4368 int res; |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4369 PyObject *arg, *value; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4370 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4371 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
|
4372 return NULL; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4373 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
|
4374 if (i == -1 && PyErr_Occurred()) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4375 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4376 res = (*func)(self, i, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4377 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4378 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4379 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4380 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4381 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4382 |
|
18941
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4383 static PyObject * |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4384 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
|
4385 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4386 ssizeobjargproc func = (ssizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4387 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4388 int res; |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4389 PyObject *arg; |
|
18941
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4390 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4391 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
|
4392 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4393 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
|
4394 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
|
4395 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
|
4396 return NULL; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4397 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
|
4398 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
|
4399 return NULL; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4400 Py_INCREF(Py_None); |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4401 return Py_None; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4402 } |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4403 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4404 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4405 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
|
4406 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4407 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4408 Py_ssize_t i, j; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4409 int res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4410 PyObject *value; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4411 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4412 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
|
4413 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4414 res = (*func)(self, i, j, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4415 if (res == -1 && PyErr_Occurred()) |
|
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 |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
4421 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
|
4422 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
|
4423 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4424 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4425 Py_ssize_t i, j; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4426 int res; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4427 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4428 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
|
4429 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
|
4430 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
|
4431 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
|
4432 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
|
4433 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
|
4434 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
|
4435 } |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
4436 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4437 /* 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
|
4438 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4439 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
|
4440 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4441 objobjproc func = (objobjproc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4442 int res; |
|
30660
36992ca918a3
Fix leak introduced by previous typeobject.c checkin.
Guido van Rossum <guido@python.org>
parents:
30659
diff
changeset
|
4443 PyObject *value; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4444 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4445 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
|
4446 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4447 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
|
4448 res = (*func)(self, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4449 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4450 return NULL; |
|
30660
36992ca918a3
Fix leak introduced by previous typeobject.c checkin.
Guido van Rossum <guido@python.org>
parents:
30659
diff
changeset
|
4451 else |
|
36992ca918a3
Fix leak introduced by previous typeobject.c checkin.
Guido van Rossum <guido@python.org>
parents:
30659
diff
changeset
|
4452 return PyBool_FromLong(res); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4453 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4454 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4455 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4456 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
|
4457 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4458 objobjargproc func = (objobjargproc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4459 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4460 PyObject *key, *value; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4461 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4462 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
|
4463 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4464 res = (*func)(self, key, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4465 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4466 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4467 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4468 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4469 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4470 |
|
18941
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4471 static PyObject * |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4472 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
|
4473 { |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4474 objobjargproc func = (objobjargproc)wrapped; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4475 int res; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4476 PyObject *key; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4477 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4478 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
|
4479 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4480 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
|
4481 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
|
4482 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
|
4483 return NULL; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4484 Py_INCREF(Py_None); |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4485 return Py_None; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4486 } |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4487 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4488 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4489 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
|
4490 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4491 cmpfunc func = (cmpfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4492 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4493 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4494 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4495 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
|
4496 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4497 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
|
4498 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
|
4499 !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
|
4500 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
|
4501 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
|
4502 "%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
|
4503 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
|
4504 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
|
4505 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
|
4506 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
|
4507 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4508 res = (*func)(self, other); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4509 if (PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4510 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4511 return PyInt_FromLong((long)res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4512 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4513 |
|
28608
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4514 /* 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
|
4515 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
|
4516 static int |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4517 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
|
4518 { |
|
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
|
4519 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
|
4520 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
|
4521 type = type->tp_base; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4522 /* If type is NULL now, this is a really weird type. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4523 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
|
4524 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
|
4525 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
|
4526 "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
|
4527 what, |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4528 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
|
4529 return 0; |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4530 } |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4531 return 1; |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4532 } |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4533 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4534 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4535 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
|
4536 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4537 setattrofunc func = (setattrofunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4538 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4539 PyObject *name, *value; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4540 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4541 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
|
4542 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
|
4543 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
|
4544 return NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4545 res = (*func)(self, name, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4546 if (res < 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4547 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4548 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4549 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4550 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4551 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4552 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4553 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
|
4554 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4555 setattrofunc func = (setattrofunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4556 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4557 PyObject *name; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4558 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4559 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
|
4560 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4561 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
|
4562 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
|
4563 return NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4564 res = (*func)(self, name, NULL); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4565 if (res < 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4566 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4567 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4568 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4569 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4570 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4571 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4572 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
|
4573 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4574 hashfunc func = (hashfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4575 long res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4576 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4577 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
|
4578 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4579 res = (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4580 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4581 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4582 return PyInt_FromLong(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4583 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4584 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4585 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
|
4586 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
|
4587 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4588 ternaryfunc func = (ternaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4589 |
|
20599
ff57a1a370b3
Methods of built-in types now properly check for keyword arguments
Guido van Rossum <guido@python.org>
parents:
20595
diff
changeset
|
4590 return (*func)(self, args, kwds); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4591 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4592 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4593 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4594 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
|
4595 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4596 richcmpfunc func = (richcmpfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4597 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4598 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4599 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
|
4600 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4601 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
|
4602 return (*func)(self, other, op); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4603 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4604 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4605 #undef RICHCMP_WRAPPER |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4606 #define RICHCMP_WRAPPER(NAME, OP) \ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4607 static PyObject * \ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4608 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
|
4609 { \ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4610 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
|
4611 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4612 |
|
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
|
4613 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
|
4614 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
|
4615 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
|
4616 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
|
4617 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
|
4618 RICHCMP_WRAPPER(ge, Py_GE) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4619 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4620 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4621 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
|
4622 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4623 unaryfunc func = (unaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4624 PyObject *res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4625 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4626 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
|
4627 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4628 res = (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4629 if (res == NULL && !PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4630 PyErr_SetNone(PyExc_StopIteration); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4631 return res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4632 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4633 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4634 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4635 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
|
4636 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4637 descrgetfunc func = (descrgetfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4638 PyObject *obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4639 PyObject *type = NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4640 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4641 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
|
4642 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
|
4643 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
|
4644 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
|
4645 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
|
4646 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
|
4647 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
|
4648 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
|
4649 "__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
|
4650 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
|
4651 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4652 return (*func)(self, obj, type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4653 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4654 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4655 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
|
4656 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
|
4657 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4658 descrsetfunc func = (descrsetfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4659 PyObject *obj, *value; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4660 int ret; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4661 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4662 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
|
4663 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4664 ret = (*func)(self, obj, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4665 if (ret < 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4666 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4667 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4668 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4669 } |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
4670 |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4671 static PyObject * |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4672 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
|
4673 { |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4674 descrsetfunc func = (descrsetfunc)wrapped; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4675 PyObject *obj; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4676 int ret; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4677 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4678 if (!check_num_args(args, 1)) |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4679 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4680 obj = PyTuple_GET_ITEM(args, 0); |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4681 ret = (*func)(self, obj, NULL); |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4682 if (ret < 0) |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4683 return NULL; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4684 Py_INCREF(Py_None); |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4685 return Py_None; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4686 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4687 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4688 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
|
4689 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
|
4690 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4691 initproc func = (initproc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4692 |
|
20599
ff57a1a370b3
Methods of built-in types now properly check for keyword arguments
Guido van Rossum <guido@python.org>
parents:
20595
diff
changeset
|
4693 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
|
4694 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4695 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4696 return Py_None; |
|
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 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4699 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
|
4700 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
|
4701 { |
|
19429
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4702 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
|
4703 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
|
4704 |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4705 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
|
4706 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
|
4707 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
|
4708 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
|
4709 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
|
4710 "%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
|
4711 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
|
4712 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
|
4713 } |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4714 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
|
4715 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
|
4716 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
|
4717 "%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
|
4718 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
|
4719 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
|
4720 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
|
4721 } |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4722 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
|
4723 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
|
4724 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
|
4725 "%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
|
4726 type->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4727 subtype->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4728 subtype->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4729 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
|
4730 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
|
4731 } |
|
19429
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4732 |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4733 /* 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
|
4734 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
|
4735 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
|
4736 staticbase = subtype; |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4737 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
|
4738 staticbase = staticbase->tp_base; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4739 /* If staticbase is NULL now, it is a really weird type. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4740 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
|
4741 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
|
4742 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
|
4743 "%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
|
4744 type->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4745 subtype->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4746 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
|
4747 return NULL; |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4748 } |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4749 |
|
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
|
4750 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
|
4751 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
|
4752 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
|
4753 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
|
4754 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
|
4755 return res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4756 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4757 |
|
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
|
4758 static struct PyMethodDef tp_new_methoddef[] = { |
|
41816
ec83d21065aa
Stop using METH_OLDARGS implicitly
Neal Norwitz <nnorwitz@gmail.com>
parents:
41576
diff
changeset
|
4759 {"__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
|
4760 PyDoc_STR("T.__new__(S, ...) -> " |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4761 "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
|
4762 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4763 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4764 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4765 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
|
4766 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
|
4767 { |
| 19036 | 4768 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
|
4769 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
4770 if (PyDict_GetItemString(type->tp_dict, "__new__") != NULL) |
| 19036 | 4771 return 0; |
| 4772 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
|
4773 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
|
4774 return -1; |
| 32407 | 4775 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
|
4776 Py_DECREF(func); |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4777 return -1; |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4778 } |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4779 Py_DECREF(func); |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4780 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
|
4781 } |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4782 |
| 19036 | 4783 /* Slot wrappers that call the corresponding __foo__ slot. See comments |
| 4784 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
|
4785 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4786 #define SLOT0(FUNCNAME, OPSTR) \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4787 static PyObject * \ |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4788 FUNCNAME(PyObject *self) \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4789 { \ |
|
19540
e141b392b61d
Fix a typo in SLOT0 macro for the declaration of cache_str.
Guido van Rossum <guido@python.org>
parents:
19538
diff
changeset
|
4790 static PyObject *cache_str; \ |
| 19911 | 4791 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
|
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 #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
|
4795 static PyObject * \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4796 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
|
4797 { \ |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4798 static PyObject *cache_str; \ |
| 19911 | 4799 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
|
4800 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4801 |
|
27124
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4802 /* 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
|
4803 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
|
4804 static int |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4805 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
|
4806 { |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4807 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
|
4808 int ok; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4809 |
|
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
|
4810 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
|
4811 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
|
4812 PyErr_Clear(); |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4813 /* 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
|
4814 return 0; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4815 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4816 |
|
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
|
4817 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
|
4818 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
|
4819 PyErr_Clear(); |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4820 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
|
4821 /* 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
|
4822 return 1; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4823 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4824 |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4825 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
|
4826 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
|
4827 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
|
4828 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
|
4829 PyErr_Clear(); |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4830 return 0; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4831 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4832 |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4833 return ok; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4834 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4835 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4836 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4837 #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
|
4838 static PyObject * \ |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4839 FUNCNAME(PyObject *self, PyObject *other) \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4840 { \ |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4841 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
|
4842 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
|
4843 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
|
4844 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
|
4845 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
|
4846 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
|
4847 PyObject *r; \ |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4848 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
|
4849 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
|
4850 method_is_overloaded(self, other, ROPSTR)) { \ |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4851 r = call_maybe( \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4852 other, ROPSTR, &rcache_str, "(O)", self); \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4853 if (r != Py_NotImplemented) \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4854 return r; \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4855 Py_DECREF(r); \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4856 do_other = 0; \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4857 } \ |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
4858 r = call_maybe( \ |
| 19911 | 4859 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
|
4860 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
|
4861 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
|
4862 return r; \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4863 Py_DECREF(r); \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4864 } \ |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4865 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
|
4866 return call_maybe( \ |
| 19911 | 4867 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
|
4868 } \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4869 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
|
4870 return Py_NotImplemented; \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4871 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4872 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4873 #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
|
4874 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
|
4875 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4876 #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
|
4877 static PyObject * \ |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4878 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
|
4879 { \ |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4880 static PyObject *cache_str; \ |
| 19911 | 4881 return call_method(self, OPSTR, &cache_str, \ |
| 4882 "(" ARGCODES ")", arg1, arg2); \ | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4883 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4884 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4885 static Py_ssize_t |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4886 slot_sq_length(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4887 { |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4888 static PyObject *len_str; |
| 19911 | 4889 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
|
4890 Py_ssize_t len; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4891 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4892 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4893 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
|
4894 len = PyInt_AsSsize_t(res); |
|
20197
b4f0f10a6c5f
slot_sq_length(): squash a leak.
Guido van Rossum <guido@python.org>
parents:
20195
diff
changeset
|
4895 Py_DECREF(res); |
|
24376
aa9e054270a2
Complain if __len__() returns < 0, just like classic classes.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24280
diff
changeset
|
4896 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
|
4897 if (!PyErr_Occurred()) |
|
6ba402b60041
Forward-port of r52136,52138: a review of overflow-detecting code.
Armin Rigo <arigo@tunes.org>
parents:
39921
diff
changeset
|
4898 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
|
4899 "__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
|
4900 return -1; |
|
aa9e054270a2
Complain if __len__() returns < 0, just like classic classes.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24280
diff
changeset
|
4901 } |
|
20197
b4f0f10a6c5f
slot_sq_length(): squash a leak.
Guido van Rossum <guido@python.org>
parents:
20195
diff
changeset
|
4902 return len; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4903 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4904 |
|
20229
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4905 /* 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
|
4906 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
|
4907 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4908 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
|
4909 { |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4910 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
|
4911 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
|
4912 descrgetfunc f; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4913 |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4914 if (getitem_str == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
4915 getitem_str = PyString_InternFromString("__getitem__"); |
|
20229
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4916 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
|
4917 return NULL; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4918 } |
|
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
|
4919 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
|
4920 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
|
4921 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
|
4922 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
|
4923 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
|
4924 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
|
4925 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
|
4926 return NULL; |
|
680bfcc9ca06
Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman
Neal Norwitz <nnorwitz@gmail.com>
parents:
25839
diff
changeset
|
4927 } |
|
680bfcc9ca06
Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman
Neal Norwitz <nnorwitz@gmail.com>
parents:
25839
diff
changeset
|
4928 } |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
4929 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
|
4930 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
|
4931 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
|
4932 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
|
4933 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
|
4934 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
|
4935 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
|
4936 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
|
4937 return retval; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4938 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4939 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4940 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4941 else { |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4942 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
|
4943 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4944 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
|
4945 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
|
4946 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
|
4947 return NULL; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4948 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4949 |
|
48854
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4950 static PyObject* |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4951 slot_sq_slice(PyObject *self, Py_ssize_t i, Py_ssize_t j) |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4952 { |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4953 static PyObject *getslice_str; |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4954 |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4955 if (PyErr_WarnPy3k("in 3.x, __getslice__ has been removed; " |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4956 "use __getitem__", 1) < 0) |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4957 return NULL; |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4958 return call_method(self, "__getslice__", &getslice_str, |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4959 "nn", i, j); |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4960 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4961 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4962 static int |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4963 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
|
4964 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4965 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
|
4966 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
|
4967 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4968 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
|
4969 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
|
4970 "(n)", index); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4971 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4972 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
|
4973 "(nO)", index, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4974 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4975 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4976 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4977 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4978 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4979 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4980 static int |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4981 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
|
4982 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4983 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
|
4984 static PyObject *delslice_str, *setslice_str; |
|
48854
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4985 |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4986 if (value == NULL) { |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4987 if (PyErr_WarnPy3k("in 3.x, __delslice__ has been removed; " |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4988 "use __delitem__", 1) < 0) |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4989 return -1; |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4990 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
|
4991 "(nn)", i, j); |
|
48854
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4992 } |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4993 else { |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4994 if (PyErr_WarnPy3k("in 3.x, __setslice__ has been removed; " |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4995 "use __setitem__", 1) < 0) |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4996 return -1; |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4997 res = call_method(self, "__setslice__", &setslice_str, |
|
48854
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4998 "(nnO)", i, j, value); |
|
6ea1a720b057
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Benjamin Peterson <benjamin@python.org>
parents:
48213
diff
changeset
|
4999 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5000 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5001 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5002 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5003 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5004 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5005 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5006 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5007 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
|
5008 { |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5009 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
|
5010 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
|
5011 |
|
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
|
5012 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
|
5013 |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5014 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
|
5015 if (func != NULL) { |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
5016 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
|
5017 if (args == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5018 res = NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5019 else { |
| 19911 | 5020 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
|
5021 Py_DECREF(args); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5022 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5023 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
|
5024 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
|
5025 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
|
5026 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
|
5027 } |
|
33319458fe99
slot_sq_contains(): This leaked a reference to the result of calling
Tim Peters <tim.peters@gmail.com>
parents:
28389
diff
changeset
|
5028 } |
|
33319458fe99
slot_sq_contains(): This leaked a reference to the result of calling
Tim Peters <tim.peters@gmail.com>
parents:
28389
diff
changeset
|
5029 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
|
5030 /* 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
|
5031 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
|
5032 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
|
5033 } |
|
33319458fe99
slot_sq_contains(): This leaked a reference to the result of calling
Tim Peters <tim.peters@gmail.com>
parents:
28389
diff
changeset
|
5034 return result; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5035 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5036 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5037 #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
|
5038 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5039 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
|
5040 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5041 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5042 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
|
5043 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5044 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
|
5045 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
|
5046 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5047 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
|
5048 res = call_method(self, "__delitem__", &delitem_str, |
| 19911 | 5049 "(O)", key); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5050 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5051 res = call_method(self, "__setitem__", &setitem_str, |
| 19911 | 5052 "(OO)", key, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5053 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5054 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5055 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5056 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5057 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5058 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5059 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
|
5060 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
|
5061 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
|
5062 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
|
5063 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
|
5064 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
|
5065 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
5066 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
|
5067 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5068 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
|
5069 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
|
5070 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5071 static PyObject * |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5072 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
|
5073 { |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5074 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
|
5075 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5076 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
|
5077 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
|
5078 /* 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
|
5079 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
|
5080 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
|
5081 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
|
5082 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
|
5083 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
|
5084 "(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
|
5085 } |
|
41097e92f560
Three's a charm: yet another fix for SF bug 551412. Thinking again
Guido van Rossum <guido@python.org>
parents:
23666
diff
changeset
|
5086 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
|
5087 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
|
5088 } |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5089 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5090 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
|
5091 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
|
5092 SLOT0(slot_nb_absolute, "__abs__") |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5093 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5094 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5095 slot_nb_nonzero(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5096 { |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
5097 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
|
5098 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
|
5099 int result = -1; |
|
52176
de7e4716d9cb
Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
Georg Brandl <georg@python.org>
parents:
51032
diff
changeset
|
5100 int using_len = 0; |
|
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
|
5101 |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5102 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
|
5103 if (func == NULL) { |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5104 if (PyErr_Occurred()) |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5105 return -1; |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5106 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
|
5107 if (func == NULL) |
|
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
5108 return PyErr_Occurred() ? -1 : 1; |
|
52176
de7e4716d9cb
Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
Georg Brandl <georg@python.org>
parents:
51032
diff
changeset
|
5109 using_len = 1; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5110 } |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
5111 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
|
5112 if (args != NULL) { |
|
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
5113 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
|
5114 Py_DECREF(args); |
|
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
5115 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
|
5116 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
|
5117 result = PyObject_IsTrue(temp); |
|
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
5118 else { |
|
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
5119 PyErr_Format(PyExc_TypeError, |
|
52176
de7e4716d9cb
Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
Georg Brandl <georg@python.org>
parents:
51032
diff
changeset
|
5120 "%s should return " |
|
29607
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
5121 "bool or int, returned %s", |
|
52176
de7e4716d9cb
Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
Georg Brandl <georg@python.org>
parents:
51032
diff
changeset
|
5122 (using_len ? "__len__" |
|
de7e4716d9cb
Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
Georg Brandl <georg@python.org>
parents:
51032
diff
changeset
|
5123 : "__nonzero__"), |
|
29607
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
5124 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
|
5125 result = -1; |
|
29607
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
5126 } |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
5127 Py_DECREF(temp); |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5128 } |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5129 } |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5130 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
|
5131 return result; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5132 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5133 |
|
36882
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5134 |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
5135 static PyObject * |
|
36882
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5136 slot_nb_index(PyObject *self) |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5137 { |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5138 static PyObject *index_str; |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
5139 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
|
5140 } |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5141 |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5142 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5143 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
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 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
|
5149 |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5150 static int |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5151 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
|
5152 { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5153 static PyObject *coerce_str; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5154 PyObject *self = *a, *other = *b; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5155 |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5156 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
|
5157 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
|
5158 PyObject *r; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5159 r = call_maybe( |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5160 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
|
5161 if (r == NULL) |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5162 return -1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5163 if (r == Py_NotImplemented) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5164 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5165 } |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5166 else { |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5167 if (!PyTuple_Check(r) || PyTuple_GET_SIZE(r) != 2) { |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5168 PyErr_SetString(PyExc_TypeError, |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5169 "__coerce__ didn't return a 2-tuple"); |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5170 Py_DECREF(r); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5171 return -1; |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5172 } |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5173 *a = PyTuple_GET_ITEM(r, 0); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5174 Py_INCREF(*a); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5175 *b = PyTuple_GET_ITEM(r, 1); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5176 Py_INCREF(*b); |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5177 Py_DECREF(r); |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5178 return 0; |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5179 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5180 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5181 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
|
5182 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
|
5183 PyObject *r; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5184 r = call_maybe( |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5185 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
|
5186 if (r == NULL) |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5187 return -1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5188 if (r == Py_NotImplemented) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5189 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5190 return 1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5191 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5192 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
|
5193 PyErr_SetString(PyExc_TypeError, |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5194 "__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
|
5195 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5196 return -1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5197 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5198 *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
|
5199 Py_INCREF(*a); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5200 *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
|
5201 Py_INCREF(*b); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5202 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5203 return 0; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5204 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5205 return 1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5206 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5207 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5208 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
|
5209 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
|
5210 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
|
5211 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
|
5212 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
|
5213 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
|
5214 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
|
5215 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
|
5216 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
|
5217 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
|
5218 /* 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
|
5219 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
|
5220 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
|
5221 { |
|
f6f391d1d050
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Martin v. Löwis <martin@v.loewis.de>
parents:
40707
diff
changeset
|
5222 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
|
5223 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
|
5224 } |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5225 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
|
5226 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
|
5227 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
|
5228 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
|
5229 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
|
5230 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
|
5231 "__floordiv__", "__rfloordiv__") |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5232 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
|
5233 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
|
5234 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
|
5235 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5236 static int |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5237 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
|
5238 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5239 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
|
5240 static PyObject *cmp_str; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5241 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
|
5242 |
|
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
|
5243 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
|
5244 if (func == NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5245 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5246 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5247 else { |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
5248 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
|
5249 if (args == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5250 res = NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5251 else { |
| 19911 | 5252 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
|
5253 Py_DECREF(args); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5254 } |
|
23967
1a8096bb4c48
Fix SF bug 572567: Memory leak in object comparison.
Raymond Hettinger <python@rcn.com>
parents:
23950
diff
changeset
|
5255 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
|
5256 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
|
5257 if (res == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5258 return -2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5259 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
|
5260 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5261 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
|
5262 return -2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5263 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
|
5264 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5265 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5266 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5267 return 2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5268 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5269 |
|
19970
f761cab28c1c
Hopefully fix 3-way comparisons. This unfortunately adds yet another
Guido van Rossum <guido@python.org>
parents:
19964
diff
changeset
|
5270 /* 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
|
5271 int |
|
f761cab28c1c
Hopefully fix 3-way comparisons. This unfortunately adds yet another
Guido van Rossum <guido@python.org>
parents:
19964
diff
changeset
|
5272 _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
|
5273 { |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5274 int c; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5275 |
|
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
|
5276 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
|
5277 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
|
5278 if (c <= 1) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5279 return c; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5280 } |
|
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
|
5281 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
|
5282 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
|
5283 if (c < -1) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5284 return -2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5285 if (c <= 1) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5286 return -c; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5287 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5288 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
|
5289 (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
|
5290 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5291 |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5292 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5293 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
|
5294 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5295 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
|
5296 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
|
5297 |
|
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
|
5298 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
|
5299 if (func != NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5300 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
|
5301 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5302 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5303 } |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
5304 PyErr_Clear(); |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
5305 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
|
5306 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
|
5307 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5308 |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5309 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5310 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
|
5311 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5312 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
|
5313 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
|
5314 |
|
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
|
5315 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
|
5316 if (func != NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5317 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
|
5318 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5319 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5320 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5321 else { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5322 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5323 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
|
5324 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5325 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5326 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5327 static long |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5328 slot_tp_hash(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5329 { |
|
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
|
5330 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
|
5331 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
|
5332 long h; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5333 |
|
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
|
5334 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
|
5335 |
|
44357
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5336 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
|
5337 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
|
5338 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5339 if (res == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5340 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
|
5341 if (PyLong_Check(res)) |
|
39415
9a8081cf4a70
Fix and test for an infinite C recursion.
Armin Rigo <arigo@tunes.org>
parents:
39410
diff
changeset
|
5342 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
|
5343 else |
|
5b9692f6629f
__hash__ may now return long int; the final hash
Martin v. Löwis <martin@v.loewis.de>
parents:
39367
diff
changeset
|
5344 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
|
5345 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
|
5346 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5347 else { |
|
44365
8dead6f81bae
Fix refleak introduced in r59576.
Georg Brandl <georg@python.org>
parents:
44357
diff
changeset
|
5348 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
|
5349 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
|
5350 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
|
5351 if (func == NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5352 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
|
5353 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
|
5354 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5355 if (func != NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5356 Py_DECREF(func); |
|
47961
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
5357 return PyObject_HashNotImplemented(self); |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5358 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5359 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5360 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
|
5361 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5362 if (h == -1 && !PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5363 h = -2; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5364 return h; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5365 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5366 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5367 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5368 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
|
5369 { |
|
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
|
5370 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
|
5371 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
|
5372 PyObject *res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5373 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5374 if (meth == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5375 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
|
5376 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5377 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
|
5378 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5379 Py_DECREF(meth); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5380 return res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5381 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5382 |
|
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
|
5383 /* 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
|
5384 |
|
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
|
5385 - 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
|
5386 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
|
5387 |
|
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
|
5388 - 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
|
5389 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5390 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
|
5391 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
|
5392 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
|
5393 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5394 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5395 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
|
5396 { |
|
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
|
5397 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
|
5398 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
|
5399 "(O)", name); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5400 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5401 |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5402 static PyObject * |
|
49741
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5403 call_attribute(PyObject *self, PyObject *attr, PyObject *name) |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5404 { |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5405 PyObject *res, *descr = NULL; |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5406 descrgetfunc f = Py_TYPE(attr)->tp_descr_get; |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5407 |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5408 if (f != NULL) { |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5409 descr = f(attr, self, (PyObject *)(Py_TYPE(self))); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5410 if (descr == NULL) |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5411 return NULL; |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5412 else |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5413 attr = descr; |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5414 } |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5415 res = PyObject_CallFunctionObjArgs(attr, name, NULL); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5416 Py_XDECREF(descr); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5417 return res; |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5418 } |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5419 |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5420 static PyObject * |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5421 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
|
5422 { |
|
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
|
5423 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
|
5424 PyObject *getattr, *getattribute, *res; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5425 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
|
5426 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
|
5427 |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5428 if (getattr_str == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
5429 getattr_str = PyString_InternFromString("__getattr__"); |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5430 if (getattr_str == NULL) |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5431 return NULL; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5432 } |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5433 if (getattribute_str == NULL) { |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5434 getattribute_str = |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
5435 PyString_InternFromString("__getattribute__"); |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5436 if (getattribute_str == NULL) |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5437 return NULL; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5438 } |
|
49741
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5439 /* speed hack: we could use lookup_maybe, but that would resolve the |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5440 method fully for each attribute lookup for classes with |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5441 __getattr__, even when the attribute is present. So we use |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5442 _PyType_Lookup and create the method only when needed, with |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5443 call_attribute. */ |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5444 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
|
5445 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
|
5446 /* 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
|
5447 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
|
5448 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
|
5449 } |
|
49741
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5450 Py_INCREF(getattr); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5451 /* speed hack: we could use lookup_maybe, but that would resolve the |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5452 method fully for each attribute lookup for classes with |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5453 __getattr__, even when self has the default __getattribute__ |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5454 method. So we use _PyType_Lookup and create the method only when |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5455 needed, with call_attribute. */ |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5456 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
|
5457 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
|
5458 (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
|
5459 ((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
|
5460 (void *)PyObject_GenericGetAttr)) |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5461 res = PyObject_GenericGetAttr(self, name); |
|
49741
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5462 else { |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5463 Py_INCREF(getattribute); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5464 res = call_attribute(self, getattribute, name); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5465 Py_DECREF(getattribute); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5466 } |
|
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
|
5467 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
|
5468 PyErr_Clear(); |
|
49741
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5469 res = call_attribute(self, getattr, name); |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5470 } |
|
73b9fe1c5397
Merged revisions 67246 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48876
diff
changeset
|
5471 Py_DECREF(getattr); |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5472 return res; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5473 } |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5474 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5475 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5476 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
|
5477 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5478 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
|
5479 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
|
5480 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5481 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
|
5482 res = call_method(self, "__delattr__", &delattr_str, |
| 19911 | 5483 "(O)", name); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5484 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5485 res = call_method(self, "__setattr__", &setattr_str, |
| 19911 | 5486 "(OO)", name, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5487 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5488 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5489 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5490 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5491 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5492 |
|
44357
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5493 static char *name_op[] = { |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5494 "__lt__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5495 "__le__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5496 "__eq__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5497 "__ne__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5498 "__gt__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5499 "__ge__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5500 }; |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5501 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5502 static PyObject * |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5503 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
|
5504 { |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5505 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
|
5506 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
|
5507 |
|
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
|
5508 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
|
5509 if (func == NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5510 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5511 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
|
5512 return Py_NotImplemented; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5513 } |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
5514 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
|
5515 if (args == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5516 res = NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5517 else { |
| 19911 | 5518 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
|
5519 Py_DECREF(args); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5520 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5521 Py_DECREF(func); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5522 return res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5523 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5524 |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5525 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5526 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
|
5527 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5528 PyObject *res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5529 |
|
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
|
5530 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
|
5531 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
|
5532 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
|
5533 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5534 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5535 } |
|
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
|
5536 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
|
5537 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
|
5538 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
|
5539 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5540 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5541 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5542 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5543 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
|
5544 return Py_NotImplemented; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5545 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5546 |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5547 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5548 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
|
5549 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5550 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
|
5551 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
|
5552 |
|
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
|
5553 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
|
5554 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
|
5555 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
|
5556 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
|
5557 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
|
5558 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
|
5559 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
|
5560 } |
|
255d1d3e66a3
Squash a few calls to the hideously expensive PyObject_CallObject(o,a)
Guido van Rossum <guido@python.org>
parents:
24862
diff
changeset
|
5561 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
|
5562 return res; |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5563 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5564 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
|
5565 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
|
5566 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
|
5567 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
|
5568 "'%.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
|
5569 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
|
5570 return NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5571 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5572 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5573 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
|
5574 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5575 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5576 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5577 slot_tp_iternext(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5578 { |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5579 static PyObject *next_str; |
| 19911 | 5580 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
|
5581 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5582 |
|
19339
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5583 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
|
5584 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
|
5585 { |
|
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
|
5586 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
|
5587 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
|
5588 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
|
5589 |
|
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5590 if (get_str == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
5591 get_str = PyString_InternFromString("__get__"); |
|
19339
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5592 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
|
5593 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
|
5594 } |
|
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5595 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
|
5596 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
|
5597 /* 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
|
5598 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
|
5599 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
|
5600 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
|
5601 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
|
5602 } |
|
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
|
5603 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
|
5604 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
|
5605 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
|
5606 type = Py_None; |
|
38314
1fdf29a88f0e
Replace PyObject_CallFunction calls with only object args
Georg Brandl <georg@python.org>
parents:
37880
diff
changeset
|
5607 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
|
5608 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5609 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5610 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5611 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
|
5612 { |
|
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
|
5613 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
|
5614 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
|
5615 |
|
45d0e114212e
slot_tp_descr_get(): guard against NULL obj or type (bug reported by
Guido van Rossum <guido@python.org>
parents:
19429
diff
changeset
|
5616 if (value == NULL) |
|
21142
842b280421ba
Fix for SF bug #485678.
Guido van Rossum <guido@python.org>
parents:
20978
diff
changeset
|
5617 res = call_method(self, "__delete__", &del_str, |
| 19911 | 5618 "(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
|
5619 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5620 res = call_method(self, "__set__", &set_str, |
| 19911 | 5621 "(OO)", target, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5622 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5623 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5624 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5625 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5626 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5627 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5628 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5629 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
|
5630 { |
|
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
|
5631 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
|
5632 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
|
5633 PyObject *res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5634 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5635 if (meth == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5636 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5637 res = PyObject_Call(meth, args, kwds); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5638 Py_DECREF(meth); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5639 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5640 return -1; |
|
34668
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5641 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
|
5642 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
|
5643 "__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
|
5644 Py_TYPE(res)->tp_name); |
|
34668
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5645 Py_DECREF(res); |
|
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5646 return -1; |
|
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5647 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5648 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5649 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5650 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5651 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5652 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5653 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
|
5654 { |
|
24680
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5655 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
|
5656 PyObject *func; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5657 PyObject *newargs, *x; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5658 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5659 |
|
24680
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5660 if (new_str == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
5661 new_str = PyString_InternFromString("__new__"); |
|
24680
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5662 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
|
5663 return NULL; |
|
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5664 } |
|
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5665 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
|
5666 if (func == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5667 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5668 assert(PyTuple_Check(args)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5669 n = PyTuple_GET_SIZE(args); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5670 newargs = PyTuple_New(n+1); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5671 if (newargs == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5672 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5673 Py_INCREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5674 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
|
5675 for (i = 0; i < n; i++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5676 x = PyTuple_GET_ITEM(args, i); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5677 Py_INCREF(x); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5678 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
|
5679 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5680 x = PyObject_Call(func, newargs, kwds); |
|
20195
3408d929bb94
slot_tp_new(): newargs was leaking.
Guido van Rossum <guido@python.org>
parents:
20190
diff
changeset
|
5681 Py_DECREF(newargs); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5682 Py_DECREF(func); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5683 return x; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5684 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5685 |
|
24678
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5686 static void |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5687 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
|
5688 { |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5689 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
|
5690 PyObject *del, *res; |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5691 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
|
5692 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5693 /* 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
|
5694 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
|
5695 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
|
5696 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5697 /* 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
|
5698 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
|
5699 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5700 /* 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
|
5701 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
|
5702 if (del != NULL) { |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5703 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
|
5704 if (res == NULL) |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5705 PyErr_WriteUnraisable(del); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5706 else |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5707 Py_DECREF(res); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5708 Py_DECREF(del); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5709 } |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5710 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5711 /* 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
|
5712 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
|
5713 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5714 /* 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
|
5715 * 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
|
5716 */ |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5717 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
|
5718 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
|
5719 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
|
5720 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5721 /* __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
|
5722 * never happened. |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5723 */ |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5724 { |
|
36866
9eb24f92a784
Change int to Py_ssize_t in several places.
Martin v. Löwis <martin@v.loewis.de>
parents:
36675
diff
changeset
|
5725 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
|
5726 _Py_NewReference(self); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5727 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
|
5728 } |
|
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
|
5729 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
|
5730 _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
|
5731 /* 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
|
5732 * 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
|
5733 _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
|
5734 /* 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
|
5735 * 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
|
5736 * 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
|
5737 * _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
|
5738 * undone. |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5739 */ |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5740 #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
|
5741 --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
|
5742 --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
|
5743 #endif |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5744 } |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5745 |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5746 |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5747 /* 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
|
5748 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
|
5749 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
|
5750 sequences and mappings. |
|
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
5751 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
|
5752 __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
|
5753 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
|
5754 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
|
5755 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
|
5756 |
|
20586
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5757 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
|
5758 |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5759 #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
|
5760 #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
|
5761 #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
|
5762 #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
|
5763 #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
|
5764 #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
|
5765 #undef UNSLOT |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5766 #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
|
5767 #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
|
5768 #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
|
5769 |
|
20586
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5770 #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
|
5771 {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
|
5772 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
|
5773 #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
|
5774 {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
|
5775 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
|
5776 #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
|
5777 {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
|
5778 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
|
5779 #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
|
5780 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
|
5781 #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
|
5782 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
|
5783 #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
|
5784 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
|
5785 #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
|
5786 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
|
5787 "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
|
5788 #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
|
5789 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
|
5790 "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
|
5791 #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
|
5792 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
|
5793 "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
|
5794 #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
|
5795 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
|
5796 "x." NAME "(y) <==> y" DOC "x") |
|
35004
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5797 #define BINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5798 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_l, \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5799 "x." NAME "(y) <==> " DOC) |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5800 #define RBINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5801 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_r, \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5802 "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
|
5803 |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5804 static slotdef slotdefs[] = { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5805 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
|
5806 "x.__len__() <==> len(x)"), |
| 36150 | 5807 /* Heap types defining __add__/__mul__ have sq_concat/sq_repeat == NULL. |
| 5808 The logic in abstract.c always falls back to nb_add/nb_multiply in | |
| 5809 this case. Defining both the nb_* and the sq_* slots to call the | |
| 5810 user-defined methods has unexpected side-effects, as shown by | |
| 5811 test_descr.notimplemented() */ | |
| 5812 SQSLOT("__add__", sq_concat, NULL, wrap_binaryfunc, | |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5813 "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
|
5814 SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5815 "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
|
5816 SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5817 "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
|
5818 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
|
5819 "x.__getitem__(y) <==> x[y]"), |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5820 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
|
5821 "x.__getslice__(i, j) <==> x[i:j]\n\ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5822 \n\ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5823 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
|
5824 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
|
5825 "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
|
5826 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
|
5827 "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
|
5828 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
|
5829 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
|
5830 "x.__setslice__(i, j, y) <==> x[i:j]=y\n\ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5831 \n\ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5832 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
|
5833 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
|
5834 "x.__delslice__(i, j) <==> del x[i:j]\n\ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5835 \n\ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5836 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
|
5837 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
|
5838 "x.__contains__(y) <==> y in x"), |
| 36150 | 5839 SQSLOT("__iadd__", sq_inplace_concat, NULL, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5840 wrap_binaryfunc, "x.__iadd__(y) <==> x+=y"), |
| 36150 | 5841 SQSLOT("__imul__", sq_inplace_repeat, NULL, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5842 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
|
5843 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5844 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
|
5845 "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
|
5846 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
|
5847 wrap_binaryfunc, |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5848 "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
|
5849 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
|
5850 wrap_objobjargproc, |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5851 "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
|
5852 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
|
5853 wrap_delitem, |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5854 "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
|
5855 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5856 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
|
5857 "+"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5858 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
|
5859 "+"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5860 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
|
5861 "-"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5862 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
|
5863 "-"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5864 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
|
5865 "*"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5866 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
|
5867 "*"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5868 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
|
5869 "/"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5870 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
|
5871 "/"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5872 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
|
5873 "%"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5874 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
|
5875 "%"), |
|
35004
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5876 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
|
5877 "divmod(x, y)"), |
|
35004
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5878 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
|
5879 "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
|
5880 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
|
5881 "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
|
5882 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
|
5883 "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
|
5884 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
|
5885 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
|
5886 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
|
5887 "abs(x)"), |
|
30670
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
5888 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
|
5889 "x != 0"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5890 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
|
5891 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
|
5892 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
|
5893 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
|
5894 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
|
5895 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
|
5896 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
|
5897 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
|
5898 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
|
5899 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
|
5900 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
|
5901 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
|
5902 "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
|
5903 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
|
5904 "int(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5905 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
|
5906 "long(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5907 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
|
5908 "float(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5909 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
|
5910 "oct(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5911 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
|
5912 "hex(x)"), |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
5913 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
|
5914 "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
|
5915 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
|
5916 wrap_binaryfunc, "+"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5917 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
|
5918 wrap_binaryfunc, "-"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5919 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
|
5920 wrap_binaryfunc, "*"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5921 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
|
5922 wrap_binaryfunc, "/"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5923 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
|
5924 wrap_binaryfunc, "%"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5925 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
|
5926 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
|
5927 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
|
5928 wrap_binaryfunc, "<<"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5929 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
|
5930 wrap_binaryfunc, ">>"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5931 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
|
5932 wrap_binaryfunc, "&"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5933 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
|
5934 wrap_binaryfunc, "^"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5935 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
|
5936 wrap_binaryfunc, "|"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5937 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
|
5938 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
|
5939 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
|
5940 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
|
5941 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
|
5942 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
|
5943 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
|
5944 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
|
5945 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5946 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
|
5947 "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
|
5948 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
|
5949 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
|
5950 "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
|
5951 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
|
5952 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
|
5953 "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
|
5954 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
|
5955 "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
|
5956 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
|
5957 "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
|
5958 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
|
5959 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
|
5960 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
|
5961 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
|
5962 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
|
5963 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
|
5964 "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
|
5965 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
|
5966 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
|
5967 "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
|
5968 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
|
5969 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
|
5970 "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
|
5971 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
|
5972 "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
|
5973 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
|
5974 "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
|
5975 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
|
5976 "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
|
5977 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
|
5978 "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
|
5979 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
|
5980 "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
|
5981 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
|
5982 "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
|
5983 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
|
5984 "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
|
5985 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
|
5986 "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
|
5987 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
|
5988 "descr.__set__(obj, value)"), |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
5989 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
|
5990 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
|
5991 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
|
5992 "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
|
5993 "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
|
5994 PyWrapperFlag_KEYWORDS), |
|
ff57a1a370b3
Methods of built-in types now properly check for keyword arguments
Guido van Rossum <guido@python.org>
parents:
20595
diff
changeset
|
5995 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
|
5996 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
|
5997 {NULL} |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5998 }; |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5999 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6000 /* 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
|
6001 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
|
6002 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
|
6003 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
|
6004 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
|
6005 static void ** |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6006 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
|
6007 { |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
6008 char *ptr; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6009 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
|
6010 |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
6011 /* 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
|
6012 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
|
6013 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
|
6014 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
|
6015 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
|
6016 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
|
6017 } |
|
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
|
6018 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
|
6019 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
|
6020 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
|
6021 } |
|
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
|
6022 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
|
6023 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
|
6024 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
|
6025 } |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
6026 else { |
|
37603
38acb91824fc
Correct casts to char*.
Martin v. Löwis <martin@v.loewis.de>
parents:
37596
diff
changeset
|
6027 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
|
6028 } |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
6029 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
|
6030 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
|
6031 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
|
6032 } |
| 19036 | 6033 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6034 /* 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
|
6035 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
|
6036 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
|
6037 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
|
6038 #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
|
6039 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6040 /* 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
|
6041 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
|
6042 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
|
6043 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
|
6044 { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6045 /* 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
|
6046 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6047 /* 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
|
6048 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
|
6049 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
|
6050 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
|
6051 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
|
6052 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6053 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
|
6054 /* 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
|
6055 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
|
6056 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
|
6057 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
|
6058 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
|
6059 *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
|
6060 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6061 *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
|
6062 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6063 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6064 /* 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
|
6065 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
|
6066 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
|
6067 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
|
6068 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
|
6069 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
|
6070 continue; |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6071 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
|
6072 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
|
6073 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
|
6074 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6075 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
|
6076 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6077 |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6078 /* 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
|
6079 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
|
6080 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
|
6081 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
|
6082 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
|
6083 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
|
6084 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
|
6085 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
|
6086 { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6087 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
|
6088 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
|
6089 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
|
6090 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
|
6091 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
|
6092 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
|
6093 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6094 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
|
6095 do { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6096 ++p; |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6097 } 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
|
6098 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
|
6099 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6100 do { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6101 descr = _PyType_Lookup(type, p->name_strobj); |
|
50754
e9748db47635
#3720: Interpreter crashes when an evil iterator removes its own next function.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
49741
diff
changeset
|
6102 if (descr == NULL) { |
|
e9748db47635
#3720: Interpreter crashes when an evil iterator removes its own next function.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
49741
diff
changeset
|
6103 if (ptr == (void**)&type->tp_iternext) { |
|
e9748db47635
#3720: Interpreter crashes when an evil iterator removes its own next function.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
49741
diff
changeset
|
6104 specific = _PyObject_NextNotImplemented; |
|
e9748db47635
#3720: Interpreter crashes when an evil iterator removes its own next function.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
49741
diff
changeset
|
6105 } |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6106 continue; |
|
50754
e9748db47635
#3720: Interpreter crashes when an evil iterator removes its own next function.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
49741
diff
changeset
|
6107 } |
|
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
|
6108 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
|
6109 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
|
6110 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
|
6111 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
|
6112 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
|
6113 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
|
6114 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
|
6115 { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6116 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
|
6117 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
|
6118 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
|
6119 else |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6120 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
|
6121 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6122 } |
|
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
|
6123 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
|
6124 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
|
6125 (PyCFunction)tp_new_wrapper && |
|
50828
27ba803bdea9
#4930: Slightly cleaner (and faster) code in type creation:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
50754
diff
changeset
|
6126 ptr == (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
|
6127 { |
|
36493a7c6253
Major speedup for new-style class creation. Turns out there was some
Guido van Rossum <guido@python.org>
parents:
24680
diff
changeset
|
6128 /* 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
|
6129 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
|
6130 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
|
6131 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
|
6132 __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
|
6133 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
|
6134 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
|
6135 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
|
6136 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
|
6137 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
|
6138 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
|
6139 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
|
6140 /* 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
|
6141 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
|
6142 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
|
6143 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
|
6144 } |
|
47961
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6145 else if (descr == Py_None && |
|
50828
27ba803bdea9
#4930: Slightly cleaner (and faster) code in type creation:
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
50754
diff
changeset
|
6146 ptr == (void**)&type->tp_hash) { |
|
47961
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6147 /* We specifically allow __hash__ to be set to None |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6148 to prevent inheritance of the default |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6149 implementation from object.__hash__ */ |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6150 specific = PyObject_HashNotImplemented; |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6151 } |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6152 else { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6153 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
|
6154 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
|
6155 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6156 } 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
|
6157 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
|
6158 *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
|
6159 else |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6160 *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
|
6161 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
|
6162 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6163 |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6164 /* 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
|
6165 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
|
6166 static int |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6167 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
|
6168 { |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6169 slotdef **pp = (slotdef **)data; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6170 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6171 for (; *pp; pp++) |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6172 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
|
6173 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
|
6174 } |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6175 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6176 /* 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
|
6177 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
|
6178 static int |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6179 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
|
6180 { |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6181 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
|
6182 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
|
6183 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
|
6184 return c; |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6185 else |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6186 /* 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
|
6187 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
|
6188 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
|
6189 } |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6190 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6191 /* 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
|
6192 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
|
6193 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
|
6194 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
|
6195 { |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6196 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
|
6197 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
|
6198 |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6199 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
|
6200 return; |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6201 for (p = slotdefs; p->name; p++) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
6202 p->name_strobj = PyString_InternFromString(p->name); |
|
20382
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6203 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
|
6204 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
|
6205 } |
|
20457
4f71dcfd0a93
Refactored the update_slot() code a bit to be hopefully slightly more
Guido van Rossum <guido@python.org>
parents:
20445
diff
changeset
|
6206 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
|
6207 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
|
6208 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
|
6209 } |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6210 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6211 /* 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
|
6212 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
|
6213 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
|
6214 { |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6215 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
|
6216 slotdef *p; |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6217 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
|
6218 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
|
6219 |
|
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
|
6220 /* 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
|
6221 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
|
6222 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
|
6223 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
|
6224 recursing into subclasses. */ |
|
47358
93fe913fae55
#2989: add PyType_Modified().
Georg Brandl <georg@python.org>
parents:
47294
diff
changeset
|
6225 PyType_Modified(type); |
|
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
|
6226 |
|
20457
4f71dcfd0a93
Refactored the update_slot() code a bit to be hopefully slightly more
Guido van Rossum <guido@python.org>
parents:
20445
diff
changeset
|
6227 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
|
6228 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
|
6229 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
|
6230 /* 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
|
6231 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
|
6232 *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
|
6233 } |
|
4f71dcfd0a93
Refactored the update_slot() code a bit to be hopefully slightly more
Guido van Rossum <guido@python.org>
parents:
20445
diff
changeset
|
6234 *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
|
6235 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
|
6236 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
|
6237 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
|
6238 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
|
6239 --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
|
6240 *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
|
6241 } |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6242 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
|
6243 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
|
6244 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
|
6245 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
|
6246 } |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6247 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6248 /* 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
|
6249 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
|
6250 dict. */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
6251 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
|
6252 fixup_slot_dispatchers(PyTypeObject *type) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
6253 { |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
6254 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
|
6255 |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6256 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
|
6257 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
|
6258 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
|
6259 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6260 |
| 26421 | 6261 static void |
| 6262 update_all_slots(PyTypeObject* type) | |
| 6263 { | |
| 6264 slotdef *p; | |
| 6265 | |
| 6266 init_slotdefs(); | |
| 6267 for (p = slotdefs; p->name; p++) { | |
| 6268 /* update_slot returns int but can't actually fail */ | |
| 6269 update_slot(type, p->name_strobj); | |
| 6270 } | |
| 6271 } | |
| 6272 | |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6273 /* 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
|
6274 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
|
6275 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
|
6276 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6277 static int |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6278 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
|
6279 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
|
6280 { |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6281 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
|
6282 return -1; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6283 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
|
6284 } |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6285 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6286 static int |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6287 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
|
6288 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
|
6289 { |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6290 PyTypeObject *subclass; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6291 PyObject *ref, *subclasses, *dict; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6292 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
|
6293 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6294 subclasses = type->tp_subclasses; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6295 if (subclasses == NULL) |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6296 return 0; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6297 assert(PyList_Check(subclasses)); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6298 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
|
6299 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
|
6300 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
|
6301 assert(PyWeakref_CheckRef(ref)); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6302 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
|
6303 assert(subclass != NULL); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6304 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
|
6305 continue; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6306 assert(PyType_Check(subclass)); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6307 /* 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
|
6308 dict = subclass->tp_dict; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6309 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
|
6310 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
|
6311 continue; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6312 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
|
6313 return -1; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6314 } |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6315 return 0; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6316 } |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6317 |
|
20586
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6318 /* 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
|
6319 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
|
6320 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
|
6321 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
|
6322 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
|
6323 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
|
6324 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
|
6325 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
|
6326 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
|
6327 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6328 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
|
6329 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
|
6330 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
|
6331 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
|
6332 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
|
6333 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
|
6334 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
|
6335 wins. |
|
23830
ade1d56109a8
Hopefully this addresses the remaining issues of SF bugs 459235 and
Guido van Rossum <guido@python.org>
parents:
23756
diff
changeset
|
6336 |
|
ade1d56109a8
Hopefully this addresses the remaining issues of SF bugs 459235 and
Guido van Rossum <guido@python.org>
parents:
23756
diff
changeset
|
6337 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
|
6338 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
|
6339 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
|
6340 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
|
6341 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
|
6342 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
|
6343 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
|
6344 (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
|
6345 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
|
6346 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
|
6347 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6348 static int |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6349 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
|
6350 { |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6351 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
|
6352 slotdef *p; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6353 PyObject *descr; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6354 void **ptr; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6355 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6356 init_slotdefs(); |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6357 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
|
6358 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
|
6359 continue; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6360 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
|
6361 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
|
6362 continue; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6363 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
|
6364 continue; |
|
47961
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6365 if (*ptr == PyObject_HashNotImplemented) { |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6366 /* Classes may prevent the inheritance of the tp_hash |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6367 slot by storing PyObject_HashNotImplemented in it. Make it |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6368 visible as a None value for the __hash__ attribute. */ |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6369 if (PyDict_SetItem(dict, p->name_strobj, Py_None) < 0) |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6370 return -1; |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6371 } |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6372 else { |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6373 descr = PyDescr_NewWrapper(type, p, *ptr); |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6374 if (descr == NULL) |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6375 return -1; |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6376 if (PyDict_SetItem(dict, p->name_strobj, descr) < 0) |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6377 return -1; |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6378 Py_DECREF(descr); |
|
f9b80a820a25
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Nick Coghlan <ncoghlan@gmail.com>
parents:
47822
diff
changeset
|
6379 } |
|
20586
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6380 } |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6381 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
|
6382 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
|
6383 return -1; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6384 } |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6385 return 0; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6386 } |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6387 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6388 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6389 /* Cooperative 'super' */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6390 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6391 typedef struct { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6392 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
|
6393 PyTypeObject *type; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6394 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
|
6395 PyTypeObject *obj_type; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6396 } superobject; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6397 |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
6398 static PyMemberDef super_members[] = { |
|
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
6399 {"__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
|
6400 "the class invoking super()"}, |
|
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
6401 {"__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
|
6402 "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
|
6403 {"__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
|
6404 "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
|
6405 {0} |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6406 }; |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6407 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6408 static void |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6409 super_dealloc(PyObject *self) |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6410 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6411 superobject *su = (superobject *)self; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6412 |
|
20220
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6413 _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
|
6414 Py_XDECREF(su->obj); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6415 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
|
6416 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
|
6417 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
|
6418 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6419 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6420 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
|
6421 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
|
6422 { |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6423 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
|
6424 |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6425 if (su->obj_type) |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
6426 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
|
6427 "<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
|
6428 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
|
6429 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
|
6430 else |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
6431 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
|
6432 "<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
|
6433 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
|
6434 } |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6435 |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6436 static PyObject * |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6437 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
|
6438 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6439 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
|
6440 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
|
6441 |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6442 if (!skip) { |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6443 /* 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
|
6444 (i.e. super, or a subclass), not the class of su->obj. */ |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
6445 skip = (PyString_Check(name) && |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
6446 PyString_GET_SIZE(name) == 9 && |
|
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
6447 strcmp(PyString_AS_STRING(name), "__class__") == 0); |
|
28638
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6448 } |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6449 |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6450 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
|
6451 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
|
6452 PyTypeObject *starttype; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6453 descrgetfunc f; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6454 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
|
6455 |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6456 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
|
6457 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
|
6458 |
|
19630
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6459 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
|
6460 n = 0; |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6461 else { |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6462 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
|
6463 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
|
6464 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6465 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
|
6466 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
|
6467 break; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6468 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6469 i++; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6470 res = NULL; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6471 for (; i < n; i++) { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6472 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
|
6473 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
|
6474 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
|
6475 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
|
6476 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
|
6477 else |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
6478 continue; |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
6479 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
|
6480 if (res != NULL) { |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6481 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
|
6482 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
|
6483 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
|
6484 tmp = f(res, |
|
37dc8c80ca7e
Ensure super() lookup of descriptor from classmethod works (SF #743627)
Phillip J. Eby <pje@telecommunity.com>
parents:
31477
diff
changeset
|
6485 /* 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
|
6486 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
|
6487 (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
|
6488 */ |
|
31813
8184c677713f
Get rid of gcc warning.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31800
diff
changeset
|
6489 (su->obj == (PyObject *) |
|
8184c677713f
Get rid of gcc warning.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31800
diff
changeset
|
6490 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
|
6491 ? (PyObject *)NULL |
|
37dc8c80ca7e
Ensure super() lookup of descriptor from classmethod works (SF #743627)
Phillip J. Eby <pje@telecommunity.com>
parents:
31477
diff
changeset
|
6492 : su->obj), |
|
22774
02fddf7c25c2
Fold some long lines. Delete blank initial line.
Guido van Rossum <guido@python.org>
parents:
22770
diff
changeset
|
6493 (PyObject *)starttype); |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6494 Py_DECREF(res); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6495 res = tmp; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6496 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6497 return res; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6498 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6499 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6500 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6501 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
|
6502 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6503 |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6504 static PyTypeObject * |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6505 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
|
6506 { |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6507 /* 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
|
6508 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6509 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
|
6510 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6511 - 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
|
6512 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
|
6513 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6514 - 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
|
6515 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
|
6516 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6517 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
|
6518 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
|
6519 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
|
6520 */ |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6521 |
|
27942
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6522 /* 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
|
6523 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
|
6524 Py_INCREF(obj); |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6525 return (PyTypeObject *)obj; |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6526 } |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6527 |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6528 /* 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
|
6529 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
|
6530 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
|
6531 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
|
6532 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6533 else { |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6534 /* 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
|
6535 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
|
6536 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
|
6537 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6538 if (class_str == NULL) { |
|
47527
52294af4b663
This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents:
47421
diff
changeset
|
6539 class_str = PyString_FromString("__class__"); |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6540 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
|
6541 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
|
6542 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6543 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6544 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
|
6545 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6546 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
|
6547 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
|
6548 (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
|
6549 { |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6550 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
|
6551 (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
|
6552 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
|
6553 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
|
6554 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6555 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6556 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
|
6557 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
|
6558 else |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6559 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
|
6560 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6561 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6562 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
|
6563 "super(type, obj): " |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6564 "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
|
6565 return NULL; |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6566 } |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6567 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6568 static PyObject * |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6569 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
|
6570 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6571 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
|
6572 superobject *newobj; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6573 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6574 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
|
6575 /* 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
|
6576 Py_INCREF(self); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6577 return self; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6578 } |
|
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
|
6579 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
|
6580 /* 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
|
6581 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
|
6582 return PyObject_CallFunctionObjArgs((PyObject *)Py_TYPE(su), |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6583 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
|
6584 else { |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6585 /* 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
|
6586 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
|
6587 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
|
6588 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
|
6589 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
|
6590 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
|
6591 if (newobj == NULL) |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6592 return NULL; |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6593 Py_INCREF(su->type); |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6594 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
|
6595 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
|
6596 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
|
6597 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
|
6598 return (PyObject *)newobj; |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6599 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6600 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6601 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6602 static int |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6603 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
|
6604 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6605 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
|
6606 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
|
6607 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
|
6608 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
|
6609 |
|
39921
49fbddfb1217
Patch #1567691: super() and new.instancemethod() now don't accept
Georg Brandl <georg@python.org>
parents:
39464
diff
changeset
|
6610 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
|
6611 return -1; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6612 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
|
6613 return -1; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6614 if (obj == Py_None) |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6615 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
|
6616 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
|
6617 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
|
6618 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
|
6619 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
|
6620 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
|
6621 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6622 Py_INCREF(type); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6623 su->type = type; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6624 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
|
6625 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
|
6626 return 0; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6627 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6628 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23830
diff
changeset
|
6629 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
|
6630 "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
|
6631 "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
|
6632 "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
|
6633 "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
|
6634 "class C(B):\n" |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6635 " def meth(self, arg):\n" |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6636 " 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
|
6637 |
|
20220
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6638 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
|
6639 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
|
6640 { |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6641 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
|
6642 |
|
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
6643 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
|
6644 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
|
6645 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
|
6646 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6647 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
|
6648 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6649 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6650 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
|
6651 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
|
6652 "super", /* tp_name */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6653 sizeof(superobject), /* tp_basicsize */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6654 0, /* tp_itemsize */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6655 /* methods */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6656 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
|
6657 0, /* tp_print */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6658 0, /* tp_getattr */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6659 0, /* tp_setattr */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6660 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
|
6661 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
|
6662 0, /* tp_as_number */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6663 0, /* tp_as_sequence */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6664 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
|
6665 0, /* tp_hash */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6666 0, /* tp_call */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6667 0, /* tp_str */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6668 super_getattro, /* tp_getattro */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6669 0, /* tp_setattro */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6670 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
|
6671 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
|
6672 Py_TPFLAGS_BASETYPE, /* tp_flags */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6673 super_doc, /* tp_doc */ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6674 super_traverse, /* tp_traverse */ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6675 0, /* tp_clear */ |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6676 0, /* tp_richcompare */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6677 0, /* tp_weaklistoffset */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6678 0, /* tp_iter */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6679 0, /* tp_iternext */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6680 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
|
6681 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
|
6682 0, /* tp_getset */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6683 0, /* tp_base */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6684 0, /* tp_dict */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6685 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
|
6686 0, /* tp_descr_set */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6687 0, /* tp_dictoffset */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6688 super_init, /* tp_init */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6689 PyType_GenericAlloc, /* tp_alloc */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6690 PyType_GenericNew, /* tp_new */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6691 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
|
6692 }; |