Mercurial > cpython-lru_cache-weakref
annotate Objects/typeobject.c @ 45837:c5241069fffd legacy-trunk
Speed up test_dict by about 10x by only checking selected dict literal sizes,
instead of every integer from 0 to 400. Exhaustive testing wastes time without
providing enough more assurance that the code is correct.
| author | Jeffrey Yasskin <jyasskin@gmail.com> |
|---|---|
| date | Tue, 18 Mar 2008 05:12:41 +0000 |
| parents | 6592e5a90c2c |
| children | 50771a3fad2c |
| 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, \ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
22 ((PyStringObject *)(name))->ob_shash) |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
23 #define MCACHE_CACHEABLE_NAME(name) \ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
24 PyString_CheckExact(name) && \ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
25 PyString_GET_SIZE(name) <= MCACHE_MAX_ATTR_SIZE |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
26 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
27 struct method_cache_entry { |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
28 unsigned int version; |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
29 PyObject *name; /* reference to exactly a str or None */ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
30 PyObject *value; /* borrowed */ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
31 }; |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
32 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
33 static struct method_cache_entry method_cache[1 << MCACHE_SIZE_EXP]; |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
34 static unsigned int next_version_tag = 0; |
|
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 static void type_modified(PyTypeObject *); |
|
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 |
|
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 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
|
38 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
|
39 { |
|
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 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
|
41 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
|
42 |
|
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 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
|
44 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
|
45 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
|
46 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
|
47 } |
|
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 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
|
49 /* mark all version tags as invalid */ |
|
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 type_modified(&PyBaseObject_Type); |
|
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 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
|
52 } |
|
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
|
53 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
54 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
|
55 type_modified(PyTypeObject *type) |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
56 { |
|
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 /* 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
|
58 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
|
59 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
|
60 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
61 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
|
62 |
|
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_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
|
64 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
|
65 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
|
66 |
|
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 - 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
|
68 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
|
69 |
|
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 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
|
71 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
|
72 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
|
73 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
|
74 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
|
75 */ |
|
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 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
|
77 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
|
78 |
| 45004 | 79 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
|
80 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
|
81 |
|
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 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
|
83 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
|
84 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
|
85 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
|
86 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
|
87 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
|
88 if (ref != Py_None) { |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
89 type_modified((PyTypeObject *)ref); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
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 } |
|
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 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
|
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 |
|
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 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
|
97 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
|
98 /* |
|
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 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
|
100 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
|
101 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
|
102 |
|
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 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
|
104 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
|
105 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
|
106 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
|
107 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
|
108 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
109 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
|
110 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
|
111 */ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
112 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
|
113 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
|
114 |
| 45004 | 115 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
|
116 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
|
117 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
118 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
|
119 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
|
120 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
|
121 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
|
122 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
123 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
|
124 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
|
125 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
|
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 |
|
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 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
|
129 |
|
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 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
|
131 !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
|
132 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
|
133 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
|
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 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
137 if (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
|
138 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
|
139 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
|
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 |
|
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 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
|
143 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
|
144 { |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
145 /* 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
|
146 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
|
147 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
|
148 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
|
149 */ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
150 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
|
151 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
|
152 |
|
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 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
|
154 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
|
155 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
|
156 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
|
157 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
|
158 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
|
159 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
160 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
|
161 /* 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
|
162 |
|
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 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
|
164 /* 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
|
165 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
|
166 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
|
167 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
|
168 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
|
169 method_cache[i].value = NULL; |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
170 Py_XDECREF(method_cache[i].name); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
171 method_cache[i].name = Py_None; |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
172 Py_INCREF(Py_None); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
173 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
174 /* mark all version tags as invalid */ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
175 type_modified(&PyBaseObject_Type); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
176 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
|
177 } |
|
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 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
|
179 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
|
180 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
|
181 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
|
182 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
|
183 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
|
184 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
|
185 } |
|
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 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
|
187 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
|
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 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
190 |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
191 static PyMemberDef type_members[] = { |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
192 {"__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
|
193 {"__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
|
194 {"__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
|
195 {"__weakrefoffset__", T_LONG, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
196 offsetof(PyTypeObject, tp_weaklistoffset), READONLY}, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
197 {"__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
|
198 {"__dictoffset__", T_LONG, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
199 offsetof(PyTypeObject, tp_dictoffset), READONLY}, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
200 {"__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
|
201 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
202 }; |
| 6 | 203 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
204 static PyObject * |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
205 type_name(PyTypeObject *type, void *context) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
206 { |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35742
diff
changeset
|
207 const char *s; |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
208 |
|
26448
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
209 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
|
210 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
|
211 |
|
36631
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
212 Py_INCREF(et->ht_name); |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
213 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
|
214 } |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
215 else { |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
216 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
|
217 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
|
218 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
|
219 else |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
220 s++; |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
221 return PyString_FromString(s); |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
222 } |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
223 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
224 |
| 26421 | 225 static int |
| 226 type_set_name(PyTypeObject *type, PyObject *value, void *context) | |
| 227 { | |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
228 PyHeapTypeObject* et; |
| 26421 | 229 |
| 230 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) { | |
| 231 PyErr_Format(PyExc_TypeError, | |
| 232 "can't set %s.__name__", type->tp_name); | |
| 233 return -1; | |
| 234 } | |
| 235 if (!value) { | |
| 236 PyErr_Format(PyExc_TypeError, | |
| 237 "can't delete %s.__name__", type->tp_name); | |
| 238 return -1; | |
| 239 } | |
| 240 if (!PyString_Check(value)) { | |
| 241 PyErr_Format(PyExc_TypeError, | |
| 242 "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
|
243 type->tp_name, Py_TYPE(value)->tp_name); |
| 26421 | 244 return -1; |
| 245 } | |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
246 if (strlen(PyString_AS_STRING(value)) |
| 26421 | 247 != (size_t)PyString_GET_SIZE(value)) { |
| 248 PyErr_Format(PyExc_ValueError, | |
| 249 "__name__ must not contain null bytes"); | |
| 250 return -1; | |
| 251 } | |
| 252 | |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
253 et = (PyHeapTypeObject*)type; |
| 26421 | 254 |
| 255 Py_INCREF(value); | |
| 256 | |
|
36631
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
257 Py_DECREF(et->ht_name); |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
258 et->ht_name = value; |
| 26421 | 259 |
| 260 type->tp_name = PyString_AS_STRING(value); | |
| 261 | |
| 262 return 0; | |
| 263 } | |
| 264 | |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
265 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
266 type_module(PyTypeObject *type, void *context) |
|
2080
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
267 { |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
268 PyObject *mod; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
269 char *s; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
270 |
|
26448
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
271 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
|
272 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
|
273 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
|
274 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
|
275 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
|
276 } |
|
26448
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
277 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
|
278 return mod; |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
279 } |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
280 else { |
|
bddc41315336
Nudge getting __module__ and __name__ for new-style classes so that
Michael W. Hudson <mwh@python.net>
parents:
26446
diff
changeset
|
281 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
|
282 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
|
283 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
|
284 type->tp_name, (Py_ssize_t)(s - type->tp_name)); |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
285 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
|
286 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
287 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
288 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
289 static int |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
290 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
|
291 { |
| 26421 | 292 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
|
293 PyErr_Format(PyExc_TypeError, |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
294 "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
|
295 return -1; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
296 } |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
297 if (!value) { |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
298 PyErr_Format(PyExc_TypeError, |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
299 "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
|
300 return -1; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
301 } |
| 26421 | 302 |
|
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 type_modified(type); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
304 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
305 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
|
306 } |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
307 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
308 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
|
309 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
|
310 { |
|
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 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
|
312 "__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
|
313 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
|
314 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
|
315 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
|
316 } |
|
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 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
|
318 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
|
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 |
|
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 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
|
322 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
|
323 { |
|
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 /* __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
|
325 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
|
326 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
|
327 */ |
|
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 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
|
329 "__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
|
330 if (res == 0) { |
|
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 type_modified(type); |
|
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 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
|
333 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
|
334 } |
|
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 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
|
336 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
|
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 } |
|
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 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
|
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 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
342 static PyObject * |
| 26421 | 343 type_get_bases(PyTypeObject *type, void *context) |
| 344 { | |
| 345 Py_INCREF(type->tp_bases); | |
| 346 return type->tp_bases; | |
| 347 } | |
| 348 | |
| 349 static PyTypeObject *best_base(PyObject *); | |
| 350 static int mro_internal(PyTypeObject *); | |
| 351 static int compatible_for_assignment(PyTypeObject *, PyTypeObject *, char *); | |
| 352 static int add_subclass(PyTypeObject*, PyTypeObject*); | |
| 353 static void remove_subclass(PyTypeObject *, PyTypeObject *); | |
| 354 static void update_all_slots(PyTypeObject *); | |
| 355 | |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
356 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
|
357 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
|
358 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
|
359 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
|
360 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
|
361 |
| 26421 | 362 static int |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
363 mro_subclasses(PyTypeObject *type, PyObject* temp) |
| 26421 | 364 { |
| 365 PyTypeObject *subclass; | |
| 366 PyObject *ref, *subclasses, *old_mro; | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
367 Py_ssize_t i, n; |
| 26421 | 368 |
| 369 subclasses = type->tp_subclasses; | |
| 370 if (subclasses == NULL) | |
| 371 return 0; | |
| 372 assert(PyList_Check(subclasses)); | |
| 373 n = PyList_GET_SIZE(subclasses); | |
| 374 for (i = 0; i < n; i++) { | |
| 375 ref = PyList_GET_ITEM(subclasses, i); | |
| 376 assert(PyWeakref_CheckRef(ref)); | |
| 377 subclass = (PyTypeObject *)PyWeakref_GET_OBJECT(ref); | |
| 378 assert(subclass != NULL); | |
| 379 if ((PyObject *)subclass == Py_None) | |
| 380 continue; | |
| 381 assert(PyType_Check(subclass)); | |
| 382 old_mro = subclass->tp_mro; | |
| 383 if (mro_internal(subclass) < 0) { | |
| 384 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
|
385 return -1; |
| 26421 | 386 } |
| 387 else { | |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
388 PyObject* tuple; |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
389 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
|
390 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
|
391 if (!tuple) |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
392 return -1; |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
393 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
|
394 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
|
395 Py_DECREF(tuple); |
| 26421 | 396 } |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
397 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
|
398 return -1; |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
399 } |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
400 return 0; |
| 26421 | 401 } |
| 402 | |
| 403 static int | |
| 404 type_set_bases(PyTypeObject *type, PyObject *value, void *context) | |
| 405 { | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
406 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
407 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
|
408 PyObject *ob, *temp; |
| 41488 | 409 PyTypeObject *new_base, *old_base; |
| 26421 | 410 PyObject *old_bases, *old_mro; |
| 411 | |
| 412 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) { | |
| 413 PyErr_Format(PyExc_TypeError, | |
| 414 "can't set %s.__bases__", type->tp_name); | |
| 415 return -1; | |
| 416 } | |
| 417 if (!value) { | |
| 418 PyErr_Format(PyExc_TypeError, | |
| 419 "can't delete %s.__bases__", type->tp_name); | |
| 420 return -1; | |
| 421 } | |
| 422 if (!PyTuple_Check(value)) { | |
| 423 PyErr_Format(PyExc_TypeError, | |
| 424 "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
|
425 type->tp_name, Py_TYPE(value)->tp_name); |
| 26421 | 426 return -1; |
| 427 } | |
|
26645
d176cbfd3765
Tighten the tests for assignment to __bases__: disallow empty tuple.
Guido van Rossum <guido@python.org>
parents:
26583
diff
changeset
|
428 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
|
429 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
|
430 "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
|
431 type->tp_name); |
|
d176cbfd3765
Tighten the tests for assignment to __bases__: disallow empty tuple.
Guido van Rossum <guido@python.org>
parents:
26583
diff
changeset
|
432 return -1; |
|
d176cbfd3765
Tighten the tests for assignment to __bases__: disallow empty tuple.
Guido van Rossum <guido@python.org>
parents:
26583
diff
changeset
|
433 } |
| 26421 | 434 for (i = 0; i < PyTuple_GET_SIZE(value); i++) { |
| 435 ob = PyTuple_GET_ITEM(value, i); | |
| 436 if (!PyClass_Check(ob) && !PyType_Check(ob)) { | |
| 437 PyErr_Format( | |
| 438 PyExc_TypeError, | |
| 439 "%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
|
440 type->tp_name, Py_TYPE(ob)->tp_name); |
| 26421 | 441 return -1; |
| 442 } | |
|
26440
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
443 if (PyType_Check(ob)) { |
|
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
444 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
|
445 PyErr_SetString(PyExc_TypeError, |
|
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
446 "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
|
447 return -1; |
|
aa0e19b6e1e7
I had the inheritance cycle stuff backwards. Oops!
Michael W. Hudson <mwh@python.net>
parents:
26425
diff
changeset
|
448 } |
| 26421 | 449 } |
| 450 } | |
| 451 | |
| 452 new_base = best_base(value); | |
| 453 | |
| 454 if (!new_base) { | |
| 455 return -1; | |
| 456 } | |
| 457 | |
| 458 if (!compatible_for_assignment(type->tp_base, new_base, "__bases__")) | |
| 459 return -1; | |
| 460 | |
| 461 Py_INCREF(new_base); | |
| 462 Py_INCREF(value); | |
| 463 | |
| 464 old_bases = type->tp_bases; | |
| 465 old_base = type->tp_base; | |
| 466 old_mro = type->tp_mro; | |
| 467 | |
| 468 type->tp_bases = value; | |
| 469 type->tp_base = new_base; | |
| 470 | |
| 471 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
|
472 goto bail; |
| 26421 | 473 } |
| 474 | |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
475 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
|
476 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
|
477 goto bail; |
|
26445
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
478 |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
479 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
|
480 |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
481 if (r < 0) { |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
482 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
|
483 PyTypeObject* cls; |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
484 PyObject* mro; |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
485 PyArg_UnpackTuple(PyList_GET_ITEM(temp, i), |
|
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
486 "", 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
|
487 Py_INCREF(mro); |
|
da403d2b886a
Fix a usage of the dangerous pattern decref - modify field - incref.
Armin Rigo <arigo@tunes.org>
parents:
41488
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 } |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
492 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
|
493 goto bail; |
|
26445
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 |
|
7421367274b4
Readjustments to the way we cope with exceptions from subclasses'
Michael W. Hudson <mwh@python.net>
parents:
26440
diff
changeset
|
496 Py_DECREF(temp); |
| 26421 | 497 |
| 498 /* any base that was in __bases__ but now isn't, we | |
| 26660 | 499 need to remove |type| from its tp_subclasses. |
| 26421 | 500 conversely, any class now in __bases__ that wasn't |
| 26660 | 501 needs to have |type| added to its subclasses. */ |
| 26421 | 502 |
| 503 /* for now, sod that: just remove from all old_bases, | |
| 504 add to all new_bases */ | |
| 505 | |
| 506 for (i = PyTuple_GET_SIZE(old_bases) - 1; i >= 0; i--) { | |
| 507 ob = PyTuple_GET_ITEM(old_bases, i); | |
| 508 if (PyType_Check(ob)) { | |
| 509 remove_subclass( | |
| 510 (PyTypeObject*)ob, type); | |
| 511 } | |
| 512 } | |
| 513 | |
| 514 for (i = PyTuple_GET_SIZE(value) - 1; i >= 0; i--) { | |
| 515 ob = PyTuple_GET_ITEM(value, i); | |
| 516 if (PyType_Check(ob)) { | |
| 517 if (add_subclass((PyTypeObject*)ob, type) < 0) | |
| 518 r = -1; | |
| 519 } | |
| 520 } | |
| 521 | |
| 522 update_all_slots(type); | |
| 523 | |
| 524 Py_DECREF(old_bases); | |
| 525 Py_DECREF(old_base); | |
| 526 Py_DECREF(old_mro); | |
| 527 | |
| 528 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
|
529 |
|
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
|
530 bail: |
|
30084
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_bases); |
|
d05d0ed465d8
Repair refcounting on error return from type_set_bases.
Michael W. Hudson <mwh@python.net>
parents:
29900
diff
changeset
|
532 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
|
533 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
|
534 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
|
535 } |
|
d05d0ed465d8
Repair refcounting on error return from type_set_bases.
Michael W. Hudson <mwh@python.net>
parents:
29900
diff
changeset
|
536 |
|
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
|
537 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
|
538 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
|
539 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
|
540 |
|
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
|
541 return -1; |
| 26421 | 542 } |
| 543 | |
| 544 static PyObject * | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
545 type_dict(PyTypeObject *type, void *context) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
546 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
547 if (type->tp_dict == NULL) { |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
548 Py_INCREF(Py_None); |
|
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
549 return Py_None; |
|
2080
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
550 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
551 return PyDictProxy_New(type->tp_dict); |
|
2080
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
552 } |
|
c21cc7b3ce28
added getattr(), supporting __doc__ and _name__
Guido van Rossum <guido@python.org>
parents:
2059
diff
changeset
|
553 |
|
22348
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
554 static PyObject * |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
555 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
|
556 { |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
557 PyObject *result; |
| 23118 | 558 if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE) && type->tp_doc != NULL) |
|
22348
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
559 return PyString_FromString(type->tp_doc); |
| 23118 | 560 result = PyDict_GetItemString(type->tp_dict, "__doc__"); |
| 561 if (result == NULL) { | |
| 562 result = Py_None; | |
| 563 Py_INCREF(result); | |
|
22348
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
564 } |
|
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
|
565 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
|
566 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
|
567 (PyObject *)type); |
| 23118 | 568 } |
| 569 else { | |
| 570 Py_INCREF(result); | |
| 571 } | |
|
22348
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
572 return result; |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
573 } |
|
51aa9eb24d81
SF patch 530070: pydoc regression, from Martin and Guido.
Tim Peters <tim.peters@gmail.com>
parents:
22331
diff
changeset
|
574 |
|
20595
c4d9d8674506
Add missing "static" declarations (found by "make smelly").
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
20586
diff
changeset
|
575 static PyGetSetDef type_getsets[] = { |
| 26421 | 576 {"__name__", (getter)type_name, (setter)type_set_name, NULL}, |
| 577 {"__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
|
578 {"__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
|
579 {"__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
|
580 (setter)type_set_abstractmethods, NULL}, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
581 {"__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
|
582 {"__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
|
583 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
584 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
585 |
|
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
|
586 static int |
|
bbac2a6a5d16
Patch #424475: Speed-up tp_compare usage, by special-casing the common
Martin v. Löwis <martin@v.loewis.de>
parents:
14375
diff
changeset
|
587 type_compare(PyObject *v, PyObject *w) |
|
bbac2a6a5d16
Patch #424475: Speed-up tp_compare usage, by special-casing the common
Martin v. Löwis <martin@v.loewis.de>
parents:
14375
diff
changeset
|
588 { |
|
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
|
589 /* This is called with type objects only. So we |
|
bbac2a6a5d16
Patch #424475: Speed-up tp_compare usage, by special-casing the common
Martin v. Löwis <martin@v.loewis.de>
parents:
14375
diff
changeset
|
590 can just compare the addresses. */ |
|
bbac2a6a5d16
Patch #424475: Speed-up tp_compare usage, by special-casing the common
Martin v. Löwis <martin@v.loewis.de>
parents:
14375
diff
changeset
|
591 Py_uintptr_t vv = (Py_uintptr_t)v; |
|
bbac2a6a5d16
Patch #424475: Speed-up tp_compare usage, by special-casing the common
Martin v. Löwis <martin@v.loewis.de>
parents:
14375
diff
changeset
|
592 Py_uintptr_t ww = (Py_uintptr_t)w; |
|
bbac2a6a5d16
Patch #424475: Speed-up tp_compare usage, by special-casing the common
Martin v. Löwis <martin@v.loewis.de>
parents:
14375
diff
changeset
|
593 return (vv < ww) ? -1 : (vv > ww) ? 1 : 0; |
|
bbac2a6a5d16
Patch #424475: Speed-up tp_compare usage, by special-casing the common
Martin v. Löwis <martin@v.loewis.de>
parents:
14375
diff
changeset
|
594 } |
|
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
|
595 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
596 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
597 type_repr(PyTypeObject *type) |
| 6 | 598 { |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
599 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
|
600 char *kind; |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
601 |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
602 mod = type_module(type, NULL); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
603 if (mod == NULL) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
604 PyErr_Clear(); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
605 else if (!PyString_Check(mod)) { |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
606 Py_DECREF(mod); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
607 mod = NULL; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
608 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
609 name = type_name(type, NULL); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
610 if (name == NULL) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
611 return NULL; |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
612 |
|
20076
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
613 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
|
614 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
|
615 else |
|
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
616 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
|
617 |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
618 if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__")) { |
|
20076
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
619 rtn = PyString_FromFormat("<%s '%s.%s'>", |
|
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
620 kind, |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
621 PyString_AS_STRING(mod), |
|
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
622 PyString_AS_STRING(name)); |
|
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
623 } |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
624 else |
|
20076
d9250d5b79a7
Change repr() of a new-style class to say <class 'ClassName'> rather
Guido van Rossum <guido@python.org>
parents:
20075
diff
changeset
|
625 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
|
626 |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
627 Py_XDECREF(mod); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
628 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
|
629 return rtn; |
| 6 | 630 } |
| 631 | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
632 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
633 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
|
634 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
635 PyObject *obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
636 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
637 if (type->tp_new == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
638 PyErr_Format(PyExc_TypeError, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
639 "cannot create '%.100s' instances", |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
640 type->tp_name); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
641 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
642 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
643 |
|
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
|
644 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
|
645 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
|
646 /* 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
|
647 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
|
648 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
|
649 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
|
650 (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
|
651 (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
|
652 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
|
653 /* 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
|
654 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
|
655 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
|
656 return obj; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
657 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
|
658 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
|
659 type->tp_init != NULL && |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
660 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
|
661 Py_DECREF(obj); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
662 obj = NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
663 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
664 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
665 return obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
666 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
667 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
668 PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
669 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
|
670 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
671 PyObject *obj; |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
672 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
|
673 /* 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
|
674 |
|
b285decf0421
Repaired the debug Windows deaths in test_descr, by allocating enough
Tim Peters <tim.peters@gmail.com>
parents:
20277
diff
changeset
|
675 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
|
676 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
|
677 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
|
678 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
|
679 |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
680 if (obj == NULL) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
681 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
|
682 |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
683 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
|
684 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
685 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
|
686 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
|
687 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
688 if (type->tp_itemsize == 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
689 PyObject_INIT(obj, type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
690 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
691 (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
|
692 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
693 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
|
694 _PyObject_GC_TRACK(obj); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
695 return obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
696 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
697 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
698 PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
699 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
|
700 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
701 return type->tp_alloc(type, 0); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
702 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
703 |
|
20277
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
704 /* 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
|
705 |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
706 static int |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
707 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
|
708 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
709 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
|
710 PyMemberDef *mp; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
711 |
|
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
|
712 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
|
713 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
|
714 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
|
715 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
|
716 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
|
717 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
|
718 if (obj != NULL) { |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
719 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
|
720 if (err) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
721 return err; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
722 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
723 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
724 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
725 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
726 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
727 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
728 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
|
729 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
|
730 { |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
731 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
|
732 traverseproc basetraverse; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
733 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
734 /* 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
|
735 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
|
736 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
|
737 base = type; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
738 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
|
739 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
|
740 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
|
741 if (err) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
742 return err; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
743 } |
|
20277
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
744 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
|
745 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
|
746 } |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
747 |
|
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
748 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
|
749 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
|
750 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
|
751 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
|
752 } |
|
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
753 |
|
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
754 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
|
755 /* For a heaptype, the instances count as references |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
756 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
|
757 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
|
758 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
|
759 |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
760 if (basetraverse) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
761 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
|
762 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
763 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
764 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
765 static void |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
766 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
|
767 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
768 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
|
769 PyMemberDef *mp; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
770 |
|
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
|
771 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
|
772 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
|
773 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
|
774 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
|
775 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
|
776 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
|
777 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
|
778 *(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
|
779 Py_DECREF(obj); |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
780 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
781 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
782 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
783 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
784 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
785 static int |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
786 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
|
787 { |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
788 PyTypeObject *type, *base; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
789 inquiry baseclear; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
790 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
791 /* 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
|
792 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
|
793 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
|
794 base = type; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
795 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
|
796 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
|
797 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
|
798 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
|
799 assert(base); |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
800 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
801 |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
802 /* 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
|
803 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
|
804 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
805 if (baseclear) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
806 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
|
807 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
|
808 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
809 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
810 static void |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
811 subtype_dealloc(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
812 { |
|
21246
cb921d483e00
The previous checkin to clear __slots__ variables did a little bit of
Guido van Rossum <guido@python.org>
parents:
21242
diff
changeset
|
813 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
|
814 destructor basedealloc; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
815 |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
816 /* 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
|
817 type = Py_TYPE(self); |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
818 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
|
819 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
820 /* 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
|
821 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
822 if (!PyType_IS_GC(type)) { |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
823 /* 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
|
824 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
|
825 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
|
826 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
|
827 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
|
828 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
829 /* 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
|
830 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
|
831 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
|
832 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
|
833 return; |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
834 } |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
835 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
836 /* 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
|
837 base = type; |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
838 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
|
839 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
|
840 base = base->tp_base; |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
841 assert(base); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
842 } |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
843 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
844 /* Call the base tp_dealloc() */ |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
845 assert(basedealloc); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
846 basedealloc(self); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
847 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
848 /* 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
|
849 Py_DECREF(type); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
850 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
851 /* Done */ |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
852 return; |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
853 } |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
854 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
855 /* 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
|
856 |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
857 /* UnTrack and re-Track around the trashcan macro, alas */ |
| 27717 | 858 /* 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
|
859 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
|
860 ++_PyTrash_delete_nesting; |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
861 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
|
862 --_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
|
863 /* 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
|
864 * (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
|
865 * 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
|
866 * 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
|
867 */ |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
868 |
|
29442
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
869 /* 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
|
870 base = type; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
871 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
|
872 base = base->tp_base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
873 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
|
874 } |
|
cb921d483e00
The previous checkin to clear __slots__ variables did a little bit of
Guido van Rossum <guido@python.org>
parents:
21242
diff
changeset
|
875 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
876 /* 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
|
877 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
|
878 dict. */ |
|
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
879 |
|
29308
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
880 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
|
881 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
|
882 |
|
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
883 /* 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
|
884 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
|
885 _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
|
886 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
|
887 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
|
888 goto endlabel; /* resurrected */ |
|
8081643c373f
subtype_dealloc(): A more complete fix for critical bug 840829 +
Tim Peters <tim.peters@gmail.com>
parents:
30907
diff
changeset
|
889 else |
|
8081643c373f
subtype_dealloc(): A more complete fix for critical bug 840829 +
Tim Peters <tim.peters@gmail.com>
parents:
30907
diff
changeset
|
890 _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
|
891 /* 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
|
892 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
|
893 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
|
894 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
|
895 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
|
896 /* 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
|
897 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
|
898 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
|
899 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
|
900 _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
|
901 } |
|
29308
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
902 } |
|
ad1e67ac567b
Fix for SF 742911. We now clear the weakrefs *before* calling __del__
Guido van Rossum <guido@python.org>
parents:
29201
diff
changeset
|
903 |
|
29442
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
904 /* 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
|
905 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
|
906 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
|
907 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
|
908 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
|
909 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
|
910 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
|
911 } |
|
6fecc99afa69
- SF patch 751998 fixes an unwanted side effect of the previous fix
Guido van Rossum <guido@python.org>
parents:
29408
diff
changeset
|
912 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
913 /* 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
|
914 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
|
915 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
|
916 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
|
917 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
|
918 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
|
919 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
|
920 *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
|
921 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
922 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
923 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
924 |
|
30917
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
925 /* 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
|
926 * basedealloc knows about gc. |
|
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
927 */ |
|
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
928 if (PyType_IS_GC(base)) |
|
12c22d6b1ec0
subtype_dealloc(): Simplified overly contorted retracking logic. With
Tim Peters <tim.peters@gmail.com>
parents:
30915
diff
changeset
|
929 _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
|
930 assert(basedealloc); |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
931 basedealloc(self); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
932 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
933 /* 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
|
934 Py_DECREF(type); |
|
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
935 |
|
24653
1ab27c1770df
Fix a subtle bug in the trashcan code I added yesterday to
Guido van Rossum <guido@python.org>
parents:
24614
diff
changeset
|
936 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
|
937 ++_PyTrash_delete_nesting; |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
938 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
|
939 --_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
|
940 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
941 /* 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
|
942 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
943 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
|
944 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
945 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
|
946 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
|
947 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
|
948 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
|
949 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
|
950 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
951 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
|
952 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
|
953 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
954 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
|
955 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
|
956 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
|
957 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
|
958 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
|
959 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
|
960 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
|
961 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
|
962 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
963 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
|
964 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
|
965 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
|
966 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
967 Q. Why did the last question say "immediately GC-track again"? |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
968 It's nowhere near immediately. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
969 |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
970 A. Because the code *used* to re-track immediately. Bad Idea. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
971 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
|
972 (which can happen if any weakref callback gets invoked), it |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
973 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
|
974 then. But we're already deleting self. Double dealloction is |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
975 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
|
976 |
|
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
|
977 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
|
978 _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
|
979 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
980 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
|
981 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
|
982 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
983 - 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
|
984 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
985 - 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
|
986 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
987 - 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
|
988 is incremented and the code between trashcan begin and end is |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
989 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
|
990 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
991 - this destroys much of the object's contents, including its |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
992 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
|
993 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
994 - basedealloc() is called; this is really list_dealloc(), or |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
995 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
|
996 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
997 - 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
|
998 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
|
999 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1000 - 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
|
1001 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1002 - 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
|
1003 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1004 - 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
|
1005 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1006 - later, the trashcan code starts deleting the objects from its |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1007 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
|
1008 |
|
e0fa52067dbe
Fix for SF #668433. I'm not explaining it here; ample comments are in
Guido van Rossum <guido@python.org>
parents:
27132
diff
changeset
|
1009 - 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
|
1010 |
|
e0fa52067dbe
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 - 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
|
1012 cause problems) the object's type gets decref'ed a second |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1013 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
|
1014 |
|
e0fa52067dbe
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 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
|
1016 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
|
1017 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
|
1018 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
|
1019 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
|
1020 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
|
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 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
|
1023 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
|
1024 the trashcan mechanism completely: the decremented level means |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1025 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
|
1026 *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
|
1027 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
|
1028 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
|
1029 |
|
e0fa52067dbe
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 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
|
1031 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
|
1032 |
|
e0fa52067dbe
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 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
|
1034 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
|
1035 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
|
1036 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
|
1037 */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1038 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1039 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1040 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
|
1041 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1042 /* type test with subclassing support */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1043 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1044 int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1045 PyType_IsSubtype(PyTypeObject *a, PyTypeObject *b) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1046 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1047 PyObject *mro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1048 |
|
19803
32cfce4d83dc
PyType_IsSubtype(): test tp_flags for HAVE_CLASS bit before accessing
Guido van Rossum <guido@python.org>
parents:
19630
diff
changeset
|
1049 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
|
1050 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
|
1051 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1052 mro = a->tp_mro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1053 if (mro != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1054 /* Deal with multiple inheritance without recursion |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1055 by walking the MRO tuple */ |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1056 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1057 assert(PyTuple_Check(mro)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1058 n = PyTuple_GET_SIZE(mro); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1059 for (i = 0; i < n; i++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1060 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
|
1061 return 1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1062 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1063 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1064 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1065 else { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1066 /* 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
|
1067 do { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1068 if (a == b) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1069 return 1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1070 a = a->tp_base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1071 } while (a != NULL); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1072 return b == &PyBaseObject_Type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1073 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1074 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1075 |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1076 /* 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
|
1077 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
|
1078 (so we can't use PyObject_GetAttr) but still binding |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1079 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
|
1080 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
|
1081 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
|
1082 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1083 Two variants: |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1084 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1085 - 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
|
1086 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
|
1087 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1088 - lookup_method() always raises an exception upon errors. |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1089 */ |
|
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
|
1090 |
|
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
|
1091 static PyObject * |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1092 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
|
1093 { |
|
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
|
1094 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
|
1095 |
|
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
|
1096 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
|
1097 *attrobj = PyString_InternFromString(attrstr); |
|
9753608e2d57
Change in policy: when a slot_tp_xxx function looks for the __xxx__ method,
Guido van Rossum <guido@python.org>
parents:
19476
diff
changeset
|
1098 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
|
1099 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
|
1100 } |
|
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
|
1101 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
|
1102 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
|
1103 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
|
1104 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
|
1105 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
|
1106 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
|
1107 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
|
1108 } |
|
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
|
1109 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
|
1110 } |
|
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
|
1111 |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1112 static PyObject * |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1113 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
|
1114 { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1115 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
|
1116 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
|
1117 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
|
1118 return res; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1119 } |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1120 |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1121 /* A variation of PyObject_CallMethod that uses lookup_method() |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1122 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
|
1123 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
|
1124 |
|
20595
c4d9d8674506
Add missing "static" declarations (found by "make smelly").
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
20586
diff
changeset
|
1125 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
|
1126 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
|
1127 { |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1128 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
|
1129 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
|
1130 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
|
1131 |
|
20225
aa18c0ecc4fb
call_method(), call_maybe(): fix a performance bug: the argument
Guido van Rossum <guido@python.org>
parents:
20220
diff
changeset
|
1132 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
|
1133 if (func == NULL) { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1134 va_end(va); |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1135 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
|
1136 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
|
1137 return NULL; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1138 } |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1139 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1140 if (format && *format) |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1141 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
|
1142 else |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1143 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
|
1144 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1145 va_end(va); |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1146 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1147 if (args == NULL) |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1148 return NULL; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1149 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1150 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
|
1151 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
|
1152 |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1153 Py_DECREF(args); |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1154 Py_DECREF(func); |
|
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 return retval; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1157 } |
|
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 /* 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
|
1160 |
|
20595
c4d9d8674506
Add missing "static" declarations (found by "make smelly").
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
20586
diff
changeset
|
1161 static PyObject * |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1162 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
|
1163 { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1164 va_list va; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1165 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
|
1166 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
|
1167 |
|
20225
aa18c0ecc4fb
call_method(), call_maybe(): fix a performance bug: the argument
Guido van Rossum <guido@python.org>
parents:
20220
diff
changeset
|
1168 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
|
1169 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
|
1170 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
|
1171 if (!PyErr_Occurred()) { |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1172 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
|
1173 return Py_NotImplemented; |
|
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
1174 } |
| 19911 | 1175 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
|
1176 } |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1177 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1178 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
|
1179 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
|
1180 else |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1181 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
|
1182 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1183 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
|
1184 |
| 19911 | 1185 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
|
1186 return NULL; |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1187 |
| 19911 | 1188 assert(PyTuple_Check(args)); |
| 1189 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
|
1190 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1191 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
|
1192 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
|
1193 |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1194 return retval; |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1195 } |
|
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
1196 |
|
20978
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1197 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
|
1198 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
|
1199 { |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1200 PyObject *bases, *base; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1201 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
|
1202 |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1203 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
|
1204 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
|
1205 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
|
1206 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
|
1207 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
|
1208 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
|
1209 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
|
1210 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
|
1211 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1212 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
|
1213 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
|
1214 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
|
1215 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
|
1216 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
|
1217 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
|
1218 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
|
1219 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1220 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
|
1221 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1222 |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1223 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
|
1224 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
|
1225 { |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1226 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
|
1227 |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1228 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
|
1229 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
|
1230 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
|
1231 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
|
1232 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
|
1233 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
|
1234 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1235 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
|
1236 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1237 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1238 /* |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1239 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
|
1240 "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
|
1241 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
|
1242 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
|
1243 (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
|
1244 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1245 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
|
1246 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1247 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
|
1248 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
|
1249 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1250 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
|
1251 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1252 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
|
1253 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
|
1254 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
|
1255 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1256 Monotonicity. |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1257 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
|
1258 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
|
1259 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1260 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
|
1261 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
|
1262 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
|
1263 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
|
1264 */ |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1265 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1266 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
|
1267 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
|
1268 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
|
1269 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
|
1270 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1271 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
|
1272 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
|
1273 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
|
1274 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1275 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
|
1276 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1277 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1278 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
|
1279 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
|
1280 { |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1281 PyObject *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
|
1282 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
|
1283 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
|
1284 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
|
1285 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
|
1286 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1287 if (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
|
1288 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
|
1289 if (!PyString_Check(name)) { |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1290 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
|
1291 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
|
1292 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1293 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
|
1294 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1295 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1296 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
|
1297 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
|
1298 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1299 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
|
1300 /* 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
|
1301 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
|
1302 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1303 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
|
1304 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
|
1305 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
|
1306 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
|
1307 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
|
1308 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
|
1309 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
|
1310 "duplicate base class %s", |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1311 o ? PyString_AS_STRING(o) : "?"); |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1312 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
|
1313 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
|
1314 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1315 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1316 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1317 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
|
1318 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1319 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1320 /* 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
|
1321 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1322 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
|
1323 insight into error reporting, report the classes that were candidates |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1324 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
|
1325 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
|
1326 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
|
1327 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1328 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1329 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
|
1330 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
|
1331 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1332 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
|
1333 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
|
1334 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
|
1335 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
|
1336 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
|
1337 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1338 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
|
1339 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
|
1340 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
|
1341 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
|
1342 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
|
1343 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
|
1344 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
|
1345 return; |
|
37067
1f4549865aad
Fix some missing checks after PyTuple_New, PyList_New, PyDict_New
Georg Brandl <georg@python.org>
parents:
36925
diff
changeset
|
1346 } |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1347 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1348 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1349 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
|
1350 |
|
28514
9400504cb0b2
SF bug #699934: Obscure error message
Raymond Hettinger <python@rcn.com>
parents:
28403
diff
changeset
|
1351 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
|
1352 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
|
1353 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
|
1354 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
|
1355 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
|
1356 off += PyOS_snprintf(buf + off, sizeof(buf) - off, " %s", |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1357 name ? PyString_AS_STRING(name) : "?"); |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1358 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
|
1359 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
|
1360 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
|
1361 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
|
1362 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1363 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1364 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
|
1365 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
|
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 |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1368 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
|
1369 pmerge(PyObject *acc, PyObject* to_merge) { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1370 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
|
1371 int *remain; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1372 int ok; |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1373 |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1374 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
|
1375 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1376 /* 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
|
1377 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
|
1378 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
|
1379 */ |
|
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
|
1380 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
|
1381 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
|
1382 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
|
1383 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
|
1384 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
|
1385 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1386 again: |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1387 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
|
1388 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
|
1389 PyObject *candidate; |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
1390 |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1391 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
|
1392 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1393 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
|
1394 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
|
1395 continue; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1396 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1397 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1398 /* 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
|
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 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
|
1401 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
|
1402 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
|
1403 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1404 |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1405 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
|
1406 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
|
1407 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
|
1408 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
|
1409 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
|
1410 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1411 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1412 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
|
1413 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
|
1414 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
|
1415 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
|
1416 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1417 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
|
1418 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
|
1419 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
|
1420 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
|
1421 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
|
1422 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1423 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1424 goto again; |
|
26227
529719a5350e
Repaired illegal syntax most compilers probably let slide (but MSVC
Tim Peters <tim.peters@gmail.com>
parents:
26222
diff
changeset
|
1425 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
|
1426 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1427 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1428 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
|
1429 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
|
1430 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
|
1431 } |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1432 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
|
1433 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
|
1434 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
|
1435 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1436 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1437 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1438 mro_implementation(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1439 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1440 Py_ssize_t i, n; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1441 int ok; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1442 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
|
1443 PyObject *to_merge, *bases_aslist; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1444 |
| 45004 | 1445 if (type->tp_dict == NULL) { |
| 1446 if (PyType_Ready(type) < 0) | |
|
23903
066f8938071a
Patch from SF bug 570483 (Tim Northover).
Guido van Rossum <guido@python.org>
parents:
23856
diff
changeset
|
1447 return NULL; |
|
066f8938071a
Patch from SF bug 570483 (Tim Northover).
Guido van Rossum <guido@python.org>
parents:
23856
diff
changeset
|
1448 } |
|
066f8938071a
Patch from SF bug 570483 (Tim Northover).
Guido van Rossum <guido@python.org>
parents:
23856
diff
changeset
|
1449 |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1450 /* 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
|
1451 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
|
1452 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
|
1453 |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1454 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
|
1455 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
|
1456 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
|
1457 */ |
|
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1458 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1459 bases = type->tp_bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1460 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
|
1461 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1462 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
|
1463 if (to_merge == NULL) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1464 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
|
1465 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1466 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
|
1467 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
|
1468 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
|
1469 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
|
1470 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
|
1471 ((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
|
1472 else |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1473 parentMRO = classic_mro(base); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1474 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
|
1475 Py_DECREF(to_merge); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1476 return NULL; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
1477 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1478 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1479 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
|
1480 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1481 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1482 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
|
1483 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
|
1484 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
|
1485 return NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1486 } |
|
26410
26918e2efd17
A tweaked version of Jeremy's patch #642489, to produce better error
Guido van Rossum <guido@python.org>
parents:
26227
diff
changeset
|
1487 /* 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
|
1488 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
|
1489 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
|
1490 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
|
1491 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
|
1492 } |
|
26222
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1493 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
|
1494 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1495 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
|
1496 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
|
1497 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
|
1498 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
|
1499 } |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1500 |
|
c95190532c0c
Use the new C3 MRO algorithm, implemented by Samuele Pedroni (SF patch
Guido van Rossum <guido@python.org>
parents:
25853
diff
changeset
|
1501 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
|
1502 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
|
1503 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
|
1504 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
|
1505 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
|
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 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1508 return result; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1509 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1510 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1511 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
|
1512 mro_external(PyObject *self) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1513 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1514 PyTypeObject *type = (PyTypeObject *)self; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1515 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1516 return mro_implementation(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1517 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1518 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1519 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1520 mro_internal(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1521 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1522 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
|
1523 int checkit = 0; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1524 |
|
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
|
1525 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
|
1526 result = mro_implementation(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1527 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1528 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
|
1529 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
|
1530 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
|
1531 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
|
1532 if (mro == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1533 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1534 result = PyObject_CallObject(mro, NULL); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1535 Py_DECREF(mro); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1536 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1537 if (result == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1538 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1539 tuple = PySequence_Tuple(result); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1540 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
|
1541 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
|
1542 return -1; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1543 if (checkit) { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1544 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
|
1545 PyObject *cls; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1546 PyTypeObject *solid; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1547 |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1548 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
|
1549 |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1550 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
|
1551 |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1552 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
|
1553 PyTypeObject *t; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1554 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
|
1555 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
|
1556 continue; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1557 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
|
1558 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
|
1559 "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
|
1560 Py_TYPE(cls)->tp_name); |
|
36169
652429c4f2a4
Fix ref/memory leak introduced in rev 41845.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36153
diff
changeset
|
1561 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
|
1562 return -1; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1563 } |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1564 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
|
1565 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
|
1566 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
|
1567 "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
|
1568 t->tp_name); |
|
36169
652429c4f2a4
Fix ref/memory leak introduced in rev 41845.
Neal Norwitz <nnorwitz@gmail.com>
parents:
36153
diff
changeset
|
1569 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
|
1570 return -1; |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1571 } |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1572 } |
|
042eb3d1ce3f
SF bug #1153075: "PyXxx_Check(x) trusts x->ob_type->tp_mro".
Armin Rigo <arigo@tunes.org>
parents:
36150
diff
changeset
|
1573 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1574 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
|
1575 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
1576 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
|
1577 /* 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
|
1578 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
|
1579 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
|
1580 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
1581 type_modified(type); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
1582 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1583 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1584 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1585 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1586 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1587 /* Calculate the best base amongst multiple base classes. |
| 41488 | 1588 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
|
1589 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1590 static PyTypeObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1591 best_base(PyObject *bases) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1592 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1593 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1594 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
|
1595 PyObject *base_proto; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1596 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1597 assert(PyTuple_Check(bases)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1598 n = PyTuple_GET_SIZE(bases); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1599 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
|
1600 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
|
1601 winner = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1602 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
|
1603 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
|
1604 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
|
1605 continue; |
| 41488 | 1606 if (!PyType_Check(base_proto)) { |
| 1607 PyErr_SetString( | |
| 1608 PyExc_TypeError, | |
| 1609 "bases must be types"); | |
| 1610 return NULL; | |
| 1611 } | |
|
20978
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1612 base_i = (PyTypeObject *)base_proto; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1613 if (base_i->tp_dict == NULL) { |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
1614 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
|
1615 return NULL; |
|
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 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
|
1618 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
|
1619 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
|
1620 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
|
1621 } |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
1622 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
|
1623 ; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1624 else if (PyType_IsSubtype(candidate, winner)) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1625 winner = candidate; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1626 base = base_i; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1627 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1628 else { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1629 PyErr_SetString( |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1630 PyExc_TypeError, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1631 "multiple bases have " |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1632 "instance lay-out conflict"); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1633 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1634 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1635 } |
| 21404 | 1636 if (base == NULL) |
| 1637 PyErr_SetString(PyExc_TypeError, | |
| 1638 "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
|
1639 return base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1640 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1641 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1642 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1643 extra_ivars(PyTypeObject *type, PyTypeObject *base) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1644 { |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
1645 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
|
1646 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
|
1647 |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1648 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
|
1649 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
|
1650 /* If itemsize is involved, stricter rules */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1651 return t_size != b_size || |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1652 type->tp_itemsize != base->tp_itemsize; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1653 } |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1654 if (type->tp_weaklistoffset && base->tp_weaklistoffset == 0 && |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1655 type->tp_weaklistoffset + sizeof(PyObject *) == t_size && |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1656 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
|
1657 t_size -= sizeof(PyObject *); |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1658 if (type->tp_dictoffset && base->tp_dictoffset == 0 && |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1659 type->tp_dictoffset + sizeof(PyObject *) == t_size && |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1660 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
|
1661 t_size -= sizeof(PyObject *); |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1662 |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
1663 return t_size != b_size; |
|
18933
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 static PyTypeObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1667 solid_base(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1668 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1669 PyTypeObject *base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1670 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1671 if (type->tp_base) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1672 base = solid_base(type->tp_base); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1673 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1674 base = &PyBaseObject_Type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1675 if (extra_ivars(type, base)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1676 return type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1677 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1678 return base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1679 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1680 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1681 static void object_dealloc(PyObject *); |
|
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1682 static int object_init(PyObject *, PyObject *, PyObject *); |
|
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1683 static int update_slot(PyTypeObject *, PyObject *); |
|
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
1684 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
|
1685 |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1686 /* |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1687 * 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
|
1688 * 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
|
1689 * 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
|
1690 */ |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1691 static PyTypeObject * |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1692 get_builtin_base_with_dict(PyTypeObject *type) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1693 { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1694 while (type->tp_base != NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1695 if (type->tp_dictoffset != 0 && |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1696 !(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1697 return type; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1698 type = type->tp_base; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1699 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1700 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1701 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1702 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1703 static PyObject * |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1704 get_dict_descriptor(PyTypeObject *type) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1705 { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1706 static PyObject *dict_str; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1707 PyObject *descr; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1708 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1709 if (dict_str == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1710 dict_str = PyString_InternFromString("__dict__"); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1711 if (dict_str == NULL) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1712 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1713 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1714 descr = _PyType_Lookup(type, dict_str); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1715 if (descr == NULL || !PyDescr_IsData(descr)) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1716 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1717 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1718 return descr; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1719 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1720 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1721 static void |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1722 raise_dict_descr_error(PyObject *obj) |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1723 { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1724 PyErr_Format(PyExc_TypeError, |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1725 "this __dict__ descriptor does not support " |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1726 "'%.200s' objects", obj->ob_type->tp_name); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1727 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1728 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1729 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
|
1730 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
|
1731 { |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1732 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
|
1733 PyObject *dict; |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1734 PyTypeObject *base; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1735 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1736 base = get_builtin_base_with_dict(obj->ob_type); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1737 if (base != NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1738 descrgetfunc func; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1739 PyObject *descr = get_dict_descriptor(base); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1740 if (descr == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1741 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1742 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1743 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1744 func = descr->ob_type->tp_descr_get; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1745 if (func == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1746 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1747 return NULL; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1748 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1749 return func(descr, obj, (PyObject *)(obj->ob_type)); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1750 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1751 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1752 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
|
1753 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
|
1754 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
|
1755 "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
|
1756 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
|
1757 } |
|
337b53679c73
Pytype_GenericAlloc(): round up size so we zap all four bytes of the
Guido van Rossum <guido@python.org>
parents:
19595
diff
changeset
|
1758 dict = *dictptr; |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1759 if (dict == NULL) |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1760 *dictptr = dict = PyDict_New(); |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1761 Py_XINCREF(dict); |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
1762 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
|
1763 } |
|
337b53679c73
Pytype_GenericAlloc(): round up size so we zap all four bytes of the
Guido van Rossum <guido@python.org>
parents:
19595
diff
changeset
|
1764 |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1765 static int |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1766 subtype_setdict(PyObject *obj, PyObject *value, void *context) |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1767 { |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1768 PyObject **dictptr; |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1769 PyObject *dict; |
|
41576
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1770 PyTypeObject *base; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1771 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1772 base = get_builtin_base_with_dict(obj->ob_type); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1773 if (base != NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1774 descrsetfunc func; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1775 PyObject *descr = get_dict_descriptor(base); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1776 if (descr == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1777 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1778 return -1; |
|
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 func = descr->ob_type->tp_descr_set; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1781 if (func == NULL) { |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1782 raise_dict_descr_error(obj); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1783 return -1; |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1784 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1785 return func(descr, obj, value); |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1786 } |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1787 |
|
980ff0b1b957
Fix for #1303614 and #1174712:
Armin Rigo <arigo@tunes.org>
parents:
41489
diff
changeset
|
1788 dictptr = _PyObject_GetDictPtr(obj); |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1789 if (dictptr == NULL) { |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1790 PyErr_SetString(PyExc_AttributeError, |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1791 "This object has no __dict__"); |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1792 return -1; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1793 } |
|
21235
b782490da7f0
At the PythonLabs meeting someone mentioned it would make Jim really
Guido van Rossum <guido@python.org>
parents:
21192
diff
changeset
|
1794 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
|
1795 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
|
1796 "__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
|
1797 "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
|
1798 return -1; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1799 } |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1800 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
|
1801 Py_XINCREF(value); |
|
20681
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1802 *dictptr = value; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1803 Py_XDECREF(dict); |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1804 return 0; |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1805 } |
|
a0f1c2d2ac9e
Allow assignment to newinstance.__dict__.
Guido van Rossum <guido@python.org>
parents:
20599
diff
changeset
|
1806 |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1807 static PyObject * |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1808 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
|
1809 { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1810 PyObject **weaklistptr; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1811 PyObject *result; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1812 |
|
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
|
1813 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
|
1814 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
|
1815 "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
|
1816 return NULL; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1817 } |
|
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
|
1818 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
|
1819 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
|
1820 (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
|
1821 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
|
1822 ((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
|
1823 if (*weaklistptr == NULL) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1824 result = Py_None; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1825 else |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1826 result = *weaklistptr; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1827 Py_INCREF(result); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1828 return result; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1829 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
1830 |
|
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
|
1831 /* 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
|
1832 |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1833 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
|
1834 {"__dict__", subtype_dict, subtype_setdict, |
|
24785
4de9ac0e4173
Allow docstrings to be removed during compilation
Neal Norwitz <nnorwitz@gmail.com>
parents:
24762
diff
changeset
|
1835 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
|
1836 {"__weakref__", subtype_getweakref, NULL, |
|
24785
4de9ac0e4173
Allow docstrings to be removed during compilation
Neal Norwitz <nnorwitz@gmail.com>
parents:
24762
diff
changeset
|
1837 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
|
1838 {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
|
1839 }; |
|
337b53679c73
Pytype_GenericAlloc(): round up size so we zap all four bytes of the
Guido van Rossum <guido@python.org>
parents:
19595
diff
changeset
|
1840 |
|
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
|
1841 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
|
1842 {"__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
|
1843 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
|
1844 {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
|
1845 }; |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1846 |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1847 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
|
1848 {"__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
|
1849 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
|
1850 {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
|
1851 }; |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
1852 |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1853 static int |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1854 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
|
1855 { |
|
24245
50443127b21d
valid_identifier(): use an unsigned char* so that isalpha() will do
Guido van Rossum <guido@python.org>
parents:
24184
diff
changeset
|
1856 unsigned char *p; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1857 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
|
1858 |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1859 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
|
1860 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
|
1861 "__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
|
1862 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
|
1863 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1864 } |
|
24245
50443127b21d
valid_identifier(): use an unsigned char* so that isalpha() will do
Guido van Rossum <guido@python.org>
parents:
24184
diff
changeset
|
1865 p = (unsigned char *) PyString_AS_STRING(s); |
|
23666
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1866 n = PyString_GET_SIZE(s); |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1867 /* 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
|
1868 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
|
1869 if (n == 0) |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1870 n = 1; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1871 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
|
1872 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
|
1873 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
|
1874 "__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
|
1875 return 0; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1876 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1877 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1878 return 1; |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1879 } |
|
2becb5793acd
Address SF bug 519621: slots weren't traversed by GC.
Guido van Rossum <guido@python.org>
parents:
23649
diff
changeset
|
1880 |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1881 #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
|
1882 /* 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
|
1883 |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1884 static PyObject * |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
1885 _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
|
1886 { |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1887 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
|
1888 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
|
1889 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
|
1890 |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1891 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
|
1892 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
|
1893 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
|
1894 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
|
1895 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
|
1896 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
|
1897 } |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1898 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
|
1899 NULL); |
|
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1900 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
|
1901 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
|
1902 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
|
1903 } |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1904 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
|
1905 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
|
1906 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
|
1907 } |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1908 } |
|
41188
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1909 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
|
1910 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
|
1911 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
|
1912 } |
|
2900ec04031d
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41110
diff
changeset
|
1913 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
|
1914 } |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1915 #endif |
|
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
1916 |
|
41287
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1917 /* Forward */ |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1918 static int |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1919 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
|
1920 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1921 static int |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1922 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
|
1923 { |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1924 int res; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1925 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1926 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
|
1927 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
|
1928 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1929 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
|
1930 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
|
1931 "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
|
1932 return -1; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1933 } |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1934 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1935 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
|
1936 (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
|
1937 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
|
1938 "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
|
1939 return -1; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1940 } |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1941 |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1942 /* 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
|
1943 /* 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
|
1944 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
|
1945 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
|
1946 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
|
1947 return res; |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1948 } |
|
12c70558074e
Add a type.__init__() method that enforces the same signature as
Guido van Rossum <guido@python.org>
parents:
41281
diff
changeset
|
1949 |
|
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
|
1950 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1951 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
|
1952 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1953 PyObject *name, *bases, *dict; |
|
36675
dba6494735d0
Revert backwards-incompatible const changes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36631
diff
changeset
|
1954 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
|
1955 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
|
1956 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
|
1957 PyHeapTypeObject *et; |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
1958 PyMemberDef *mp; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1959 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
|
1960 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
|
1961 |
|
20725
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
1962 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
|
1963 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
|
1964 |
|
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
|
1965 /* 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
|
1966 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
1967 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
|
1968 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
|
1969 |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
1970 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
|
1971 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
|
1972 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
|
1973 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
|
1974 } |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
1975 |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
1976 /* 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
|
1977 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
|
1978 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
|
1979 if (nargs + nkwds != 3) { |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
1980 PyErr_SetString(PyExc_TypeError, |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
1981 "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
|
1982 return NULL; |
|
7130750a6222
SF bug #475327: type() produces incorrect error msg
Tim Peters <tim.peters@gmail.com>
parents:
20681
diff
changeset
|
1983 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1984 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1985 |
|
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
|
1986 /* Check arguments: (name, bases, dict) */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1987 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
|
1988 &name, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1989 &PyTuple_Type, &bases, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1990 &PyDict_Type, &dict)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1991 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
1992 |
| 41488 | 1993 /* Determine the proper metatype to deal with this, |
| 1994 and check for metatype conflicts while we're at it. | |
| 1995 Note that if some other metatype wins to contract, | |
| 1996 it's possible that its instances are not types. */ | |
| 1997 nbases = PyTuple_GET_SIZE(bases); | |
| 1998 winner = metatype; | |
| 1999 for (i = 0; i < nbases; i++) { | |
| 2000 tmp = PyTuple_GET_ITEM(bases, i); | |
| 2001 tmptype = tmp->ob_type; | |
| 2002 if (tmptype == &PyClass_Type) | |
| 2003 continue; /* Special case classic classes */ | |
| 2004 if (PyType_IsSubtype(winner, tmptype)) | |
| 2005 continue; | |
| 2006 if (PyType_IsSubtype(tmptype, winner)) { | |
| 2007 winner = tmptype; | |
| 2008 continue; | |
| 2009 } | |
| 2010 PyErr_SetString(PyExc_TypeError, | |
| 2011 "metaclass conflict: " | |
| 2012 "the metaclass of a derived class " | |
| 2013 "must be a (non-strict) subclass " | |
| 2014 "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
|
2015 return NULL; |
| 41488 | 2016 } |
|
40975
d62805a993c5
Add checking for a number of metaclass error conditions.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40974
diff
changeset
|
2017 if (winner != metatype) { |
| 41488 | 2018 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
|
2019 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
|
2020 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
|
2021 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2022 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2023 /* Adjust for empty tuple bases */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2024 if (nbases == 0) { |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
2025 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
|
2026 if (bases == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2027 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2028 nbases = 1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2029 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2030 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2031 Py_INCREF(bases); |
|
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 /* 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
|
2034 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2035 /* 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
|
2036 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
|
2037 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
|
2038 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2039 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
|
2040 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2041 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
|
2042 PyErr_Format(PyExc_TypeError, |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2043 "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
|
2044 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
|
2045 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2046 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2047 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2048 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2049 /* 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
|
2050 slots = PyDict_GetItemString(dict, "__slots__"); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2051 nslots = 0; |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
2052 add_dict = 0; |
|
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
2053 add_weak = 0; |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2054 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
|
2055 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
|
2056 if (slots == NULL) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2057 if (may_add_dict) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2058 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2059 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2060 if (may_add_weak) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2061 add_weak++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2062 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2063 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2064 else { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2065 /* Have slots */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2066 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2067 /* Make it into a tuple */ |
|
41463
5f8a87fb4df3
When __slots__ are set to a unicode string, make it work the same as
Neal Norwitz <nnorwitz@gmail.com>
parents:
41287
diff
changeset
|
2068 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
|
2069 slots = PyTuple_Pack(1, slots); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2070 else |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2071 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
|
2072 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
|
2073 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2074 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
|
2075 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2076 assert(PyTuple_Check(slots)); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2077 |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2078 /* Are slots allowed? */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2079 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
|
2080 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
|
2081 PyErr_Format(PyExc_TypeError, |
|
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2082 "nonempty __slots__ " |
|
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2083 "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
|
2084 base->tp_name); |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2085 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
|
2086 Py_DECREF(bases); |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2087 Py_DECREF(slots); |
|
19595
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2088 return NULL; |
|
db36e396f043
Safety measures now that str and tuple are subclassable:
Guido van Rossum <guido@python.org>
parents:
19594
diff
changeset
|
2089 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2090 |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
2091 #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
|
2092 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
|
2093 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
|
2094 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
|
2095 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
|
2096 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
|
2097 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
|
2098 } |
|
25792
a3d612f0563f
Allow Unicode strings in __slots__, converting them to byte strings.
Martin v. Löwis <martin@v.loewis.de>
parents:
24867
diff
changeset
|
2099 #endif |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2100 /* 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
|
2101 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
|
2102 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
|
2103 char *s; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2104 if (!valid_identifier(tmp)) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2105 goto bad_slots; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2106 assert(PyString_Check(tmp)); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2107 s = PyString_AS_STRING(tmp); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2108 if (strcmp(s, "__dict__") == 0) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2109 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
|
2110 PyErr_SetString(PyExc_TypeError, |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2111 "__dict__ slot disallowed: " |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2112 "we already got one"); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2113 goto bad_slots; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2114 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2115 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2116 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2117 if (strcmp(s, "__weakref__") == 0) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2118 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
|
2119 PyErr_SetString(PyExc_TypeError, |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2120 "__weakref__ slot disallowed: " |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2121 "either we already got one, " |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2122 "or __itemsize__ != 0"); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2123 goto bad_slots; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2124 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2125 add_weak++; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2126 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2127 } |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2128 |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2129 /* 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
|
2130 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
|
2131 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
|
2132 */ |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2133 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
|
2134 if (newslots == NULL) |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2135 goto bad_slots; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2136 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
|
2137 char *s; |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2138 tmp = PyTuple_GET_ITEM(slots, i); |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2139 s = PyString_AS_STRING(tmp); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2140 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
|
2141 (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
|
2142 continue; |
|
35742
1c4d192f1568
Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35637
diff
changeset
|
2143 tmp =_Py_Mangle(name, tmp); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2144 if (!tmp) |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2145 goto bad_slots; |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2146 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
|
2147 j++; |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2148 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2149 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
|
2150 nslots = j; |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2151 Py_DECREF(slots); |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2152 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
|
2153 Py_DECREF(bases); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2154 Py_DECREF(newslots); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2155 return NULL; |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2156 } |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2157 slots = PyList_AsTuple(newslots); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2158 Py_DECREF(newslots); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2159 if (slots == NULL) { |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2160 Py_DECREF(bases); |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2161 return NULL; |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2162 } |
|
23950
f7ce696979e1
SF 569257 -- Name mangle double underscored variable names in __slots__.
Raymond Hettinger <python@rcn.com>
parents:
23903
diff
changeset
|
2163 |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2164 /* 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
|
2165 if (nbases > 1 && |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2166 ((may_add_dict && !add_dict) || |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2167 (may_add_weak && !add_weak))) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2168 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
|
2169 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
|
2170 if (tmp == (PyObject *)base) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2171 continue; /* Skip primary base */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2172 if (PyClass_Check(tmp)) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2173 /* Classic base class provides both */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2174 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
|
2175 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2176 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
|
2177 add_weak++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2178 break; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2179 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2180 assert(PyType_Check(tmp)); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2181 tmptype = (PyTypeObject *)tmp; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2182 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
|
2183 tmptype->tp_dictoffset != 0) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2184 add_dict++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2185 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
|
2186 tmptype->tp_weaklistoffset != 0) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2187 add_weak++; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2188 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
|
2189 continue; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2190 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
|
2191 continue; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2192 /* Nothing more to check */ |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2193 break; |
|
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 } |
|
19349
9b5a2c1a02f3
Weak reference support, closing SF bug #451773.
Guido van Rossum <guido@python.org>
parents:
19339
diff
changeset
|
2196 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2197 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2198 /* 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
|
2199 "return NULL" may leak slots! */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2200 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2201 /* Allocate the type object */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2202 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
|
2203 if (type == NULL) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2204 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
|
2205 Py_DECREF(bases); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2206 return NULL; |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2207 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2208 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2209 /* 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
|
2210 et = (PyHeapTypeObject *)type; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2211 Py_INCREF(name); |
|
36631
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
2212 et->ht_name = name; |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
2213 et->ht_slots = slots; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2214 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2215 /* Initialize tp_flags */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2216 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
|
2217 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
|
2218 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
|
2219 type->tp_flags |= Py_TPFLAGS_HAVE_GC; |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2220 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2221 /* 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
|
2222 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
|
2223 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
|
2224 (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
|
2225 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
|
2226 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
2227 /* Initialize essential fields */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2228 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
|
2229 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
|
2230 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
|
2231 type->tp_as_buffer = &et->as_buffer; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2232 type->tp_name = PyString_AS_STRING(name); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2233 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2234 /* Set tp_base and tp_bases */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2235 type->tp_bases = bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2236 Py_INCREF(base); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2237 type->tp_base = base; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2238 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
2239 /* 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
|
2240 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
|
2241 if (dict == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2242 Py_DECREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2243 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2244 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2245 |
|
19300
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2246 /* Set __module__ in the dict */ |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2247 if (PyDict_GetItemString(dict, "__module__") == NULL) { |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2248 tmp = PyEval_GetGlobals(); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2249 if (tmp != NULL) { |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2250 tmp = PyDict_GetItemString(tmp, "__name__"); |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2251 if (tmp != NULL) { |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2252 if (PyDict_SetItemString(dict, "__module__", |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2253 tmp) < 0) |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2254 return NULL; |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2255 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2256 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2257 } |
|
81440dd326bb
Fix SF bug #442501: calculate __module__ properly.
Guido van Rossum <guido@python.org>
parents:
19297
diff
changeset
|
2258 |
|
20239
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2259 /* 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
|
2260 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
|
2261 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
|
2262 */ |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2263 { |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2264 PyObject *doc = PyDict_GetItemString(dict, "__doc__"); |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2265 if (doc != NULL && PyString_Check(doc)) { |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2266 const size_t n = (size_t)PyString_GET_SIZE(doc); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2267 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
|
2268 if (tp_doc == NULL) { |
|
20239
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2269 Py_DECREF(type); |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2270 return NULL; |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2271 } |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35742
diff
changeset
|
2272 memcpy(tp_doc, PyString_AS_STRING(doc), n+1); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2273 type->tp_doc = tp_doc; |
|
20239
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2274 } |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2275 } |
|
2745c3dc24af
SF bug [#467331] ClassType.__doc__ always None.
Tim Peters <tim.peters@gmail.com>
parents:
20231
diff
changeset
|
2276 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2277 /* 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
|
2278 make it a static function */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2279 tmp = PyDict_GetItemString(dict, "__new__"); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2280 if (tmp != NULL && PyFunction_Check(tmp)) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2281 tmp = PyStaticMethod_New(tmp); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2282 if (tmp == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2283 Py_DECREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2284 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2285 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2286 PyDict_SetItemString(dict, "__new__", tmp); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2287 Py_DECREF(tmp); |
|
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 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2290 /* 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
|
2291 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
|
2292 slotoffset = base->tp_basicsize; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2293 if (slots != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2294 for (i = 0; i < nslots; i++, mp++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2295 mp->name = PyString_AS_STRING( |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2296 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
|
2297 mp->type = T_OBJECT_EX; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2298 mp->offset = slotoffset; |
|
41110
a8ae2c29c66a
Patch #1675981: remove unreachable code from type.__new__() method.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
40975
diff
changeset
|
2299 |
|
a8ae2c29c66a
Patch #1675981: remove unreachable code from type.__new__() method.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
40975
diff
changeset
|
2300 /* __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
|
2301 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
|
2302 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
|
2303 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2304 slotoffset += sizeof(PyObject *); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2305 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2306 } |
|
24761
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2307 if (add_dict) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2308 if (base->tp_itemsize) |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2309 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
|
2310 else |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2311 type->tp_dictoffset = slotoffset; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2312 slotoffset += sizeof(PyObject *); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2313 } |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2314 if (add_weak) { |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2315 assert(!base->tp_itemsize); |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2316 type->tp_weaklistoffset = slotoffset; |
|
e0431d9c4474
Refactor how __dict__ and __weakref__ interact with __slots__.
Guido van Rossum <guido@python.org>
parents:
24728
diff
changeset
|
2317 slotoffset += sizeof(PyObject *); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2318 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2319 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
|
2320 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
|
2321 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
|
2322 |
|
22d660494f29
Fix for SF bug #642358: only provide a new with a __dict__ or
Guido van Rossum <guido@python.org>
parents:
27124
diff
changeset
|
2323 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
|
2324 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
|
2325 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
|
2326 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
|
2327 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
|
2328 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
|
2329 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
|
2330 type->tp_getset = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2331 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2332 /* Special case some slots */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2333 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
|
2334 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
|
2335 type->tp_getattro = PyObject_GenericGetAttr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2336 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
|
2337 type->tp_setattro = PyObject_GenericSetAttr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2338 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2339 type->tp_dealloc = subtype_dealloc; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2340 |
|
20277
2983b54256c7
Enable GC for new-style instances. This touches lots of files, since
Guido van Rossum <guido@python.org>
parents:
20259
diff
changeset
|
2341 /* 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
|
2342 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
|
2343 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
|
2344 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
|
2345 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2346 /* 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
|
2347 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
|
2348 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
|
2349 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
|
2350 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
|
2351 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
|
2352 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2353 else |
|
22980
9f949027d7ba
Change signature of _PyObject_GC_Malloc to match PyObject_MALLOC.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
22871
diff
changeset
|
2354 type->tp_free = PyObject_Del; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2355 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2356 /* Initialize the rest */ |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
2357 if (PyType_Ready(type) < 0) { |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2358 Py_DECREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2359 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2360 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2361 |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
2362 /* 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
|
2363 fixup_slot_dispatchers(type); |
| 19036 | 2364 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2365 return (PyObject *)type; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2366 } |
|
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 /* 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
|
2369 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
|
2370 PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2371 _PyType_Lookup(PyTypeObject *type, PyObject *name) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2372 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
2373 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
|
2374 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
|
2375 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
|
2376 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2377 if (MCACHE_CACHEABLE_NAME(name) && |
| 45004 | 2378 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
|
2379 /* 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
|
2380 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
|
2381 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
|
2382 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
|
2383 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
|
2384 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2385 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
2386 /* 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
|
2387 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
|
2388 |
|
41097e92f560
Three's a charm: yet another fix for SF bug 551412. Thinking again
Guido van Rossum <guido@python.org>
parents:
23666
diff
changeset
|
2389 /* 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
|
2390 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
|
2391 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
|
2392 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
|
2393 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
|
2394 |
|
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
|
2395 res = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2396 assert(PyTuple_Check(mro)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2397 n = PyTuple_GET_SIZE(mro); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2398 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
|
2399 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
|
2400 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
|
2401 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
|
2402 else { |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
2403 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
|
2404 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
|
2405 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2406 assert(dict && PyDict_Check(dict)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2407 res = PyDict_GetItem(dict, name); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2408 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
|
2409 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
|
2410 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2411 |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2412 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
|
2413 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
|
2414 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
|
2415 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
|
2416 Py_INCREF(name); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2417 Py_DECREF(method_cache[h].name); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2418 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
|
2419 } |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
2420 return res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2421 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2422 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2423 /* This is similar to PyObject_GenericGetAttr(), |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2424 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
|
2425 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2426 type_getattro(PyTypeObject *type, PyObject *name) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2427 { |
|
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
|
2428 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
|
2429 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
|
2430 descrgetfunc meta_get; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2431 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2432 /* 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
|
2433 if (type->tp_dict == NULL) { |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
2434 if (PyType_Ready(type) < 0) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2435 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2436 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2437 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2438 /* 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
|
2439 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
|
2440 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2441 /* 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
|
2442 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
|
2443 |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2444 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
|
2445 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
|
2446 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2447 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
|
2448 /* 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
|
2449 * 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
|
2450 * 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
|
2451 */ |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2452 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
|
2453 (PyObject *)metatype); |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2454 } |
| 30159 | 2455 Py_INCREF(meta_attribute); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2456 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2457 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2458 /* 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
|
2459 * 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
|
2460 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
|
2461 if (attribute != NULL) { |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2462 /* 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
|
2463 descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get; |
| 30159 | 2464 |
| 2465 Py_XDECREF(meta_attribute); | |
| 2466 | |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2467 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
|
2468 /* 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
|
2469 * 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
|
2470 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
|
2471 (PyObject *)type); |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2472 } |
|
24184
c4dcb80f48ea
object.h special-build macro minefield: renamed all the new lexical
Tim Peters <tim.peters@gmail.com>
parents:
23967
diff
changeset
|
2473 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2474 Py_INCREF(attribute); |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2475 return attribute; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2476 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2477 |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2478 /* 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
|
2479 * descriptor from the metatype, if any */ |
| 30159 | 2480 if (meta_get != NULL) { |
| 2481 PyObject *res; | |
| 2482 res = meta_get(meta_attribute, (PyObject *)type, | |
| 2483 (PyObject *)metatype); | |
| 2484 Py_DECREF(meta_attribute); | |
| 2485 return res; | |
| 2486 } | |
|
22804
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2487 |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2488 /* 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
|
2489 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
|
2490 return meta_attribute; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2491 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2492 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2493 /* Give up */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2494 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
|
2495 "type object '%.50s' has no attribute '%.400s'", |
|
77343aa03e2f
Clarifying code rearrangement and comments by David Abrahams. I've
Guido van Rossum <guido@python.org>
parents:
22774
diff
changeset
|
2496 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
|
2497 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2498 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2499 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2500 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2501 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
|
2502 { |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2503 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
|
2504 PyErr_Format( |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2505 PyExc_TypeError, |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2506 "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
|
2507 type->tp_name); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2508 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
|
2509 } |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2510 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
|
2511 return -1; |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
2512 return update_slot(type, name); |
|
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 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2515 static void |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2516 type_dealloc(PyTypeObject *type) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2517 { |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
2518 PyHeapTypeObject *et; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2519 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2520 /* 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
|
2521 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
|
2522 _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
|
2523 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
|
2524 et = (PyHeapTypeObject *)type; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2525 Py_XDECREF(type->tp_base); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2526 Py_XDECREF(type->tp_dict); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2527 Py_XDECREF(type->tp_bases); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2528 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
|
2529 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
|
2530 Py_XDECREF(type->tp_subclasses); |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2531 /* 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
|
2532 * 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
|
2533 */ |
|
35999
9541369b0dca
Add const to several API functions that take char *.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
35742
diff
changeset
|
2534 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
|
2535 Py_XDECREF(et->ht_name); |
|
49d9c120357a
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Georg Brandl <georg@python.org>
parents:
36519
diff
changeset
|
2536 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
|
2537 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
|
2538 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2539 |
|
20315
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2540 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
|
2541 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
|
2542 { |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2543 PyObject *list, *raw, *ref; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
2544 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
|
2545 |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2546 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
|
2547 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
|
2548 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
|
2549 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
|
2550 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
|
2551 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
|
2552 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
|
2553 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
|
2554 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
|
2555 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
|
2556 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
|
2557 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
|
2558 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
|
2559 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
|
2560 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
|
2561 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
|
2562 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2563 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2564 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2565 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
|
2566 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2567 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2568 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
|
2569 {"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
|
2570 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
|
2571 {"__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
|
2572 PyDoc_STR("__subclasses__() -> list of immediate subclasses")}, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2573 {0} |
|
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 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23830
diff
changeset
|
2576 PyDoc_STRVAR(type_doc, |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2577 "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
|
2578 "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
|
2579 |
|
20220
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2580 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
|
2581 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
|
2582 { |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2583 /* 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
|
2584 for heaptypes. */ |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2585 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
|
2586 |
|
37756
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
2587 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
|
2588 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
|
2589 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
|
2590 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
|
2591 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
|
2592 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2593 /* 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
|
2594 ((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
|
2595 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
|
2596 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
|
2597 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2598 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
|
2599 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2600 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2601 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
|
2602 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
|
2603 { |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2604 /* 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
|
2605 for heaptypes. */ |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2606 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
|
2607 |
|
23755
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2608 /* 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
|
2609 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
|
2610 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
|
2611 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
|
2612 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
|
2613 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2614 tp_dict: |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2615 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
|
2616 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2617 tp_cache: |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2618 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
|
2619 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2620 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
|
2621 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
|
2622 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
|
2623 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
|
2624 |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2625 tp_subclasses: |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2626 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
|
2627 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
|
2628 |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
2629 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
|
2630 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
|
2631 */ |
|
0279040ae03c
In the recent python-dev thread "Bizarre new test failure", we
Guido van Rossum <guido@python.org>
parents:
23753
diff
changeset
|
2632 |
|
37748
d1547426ab61
Use Py_CLEAR instead of in-place DECREF/XDECREF or custom macros, for
Thomas Wouters <thomas@python.org>
parents:
37603
diff
changeset
|
2633 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
|
2634 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2635 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
|
2636 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2637 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2638 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
|
2639 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
|
2640 { |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2641 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
|
2642 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
2643 |
|
5396
d1447950fa04
Quickly renamed the last directory.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
2644 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
|
2645 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
|
2646 "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
|
2647 sizeof(PyHeapTypeObject), /* tp_basicsize */ |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
2648 sizeof(PyMemberDef), /* tp_itemsize */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2649 (destructor)type_dealloc, /* tp_dealloc */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2650 0, /* tp_print */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2651 0, /* tp_getattr */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2652 0, /* tp_setattr */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2653 type_compare, /* tp_compare */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2654 (reprfunc)type_repr, /* tp_repr */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2655 0, /* tp_as_number */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2656 0, /* tp_as_sequence */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2657 0, /* tp_as_mapping */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2658 (hashfunc)_Py_HashPointer, /* tp_hash */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2659 (ternaryfunc)type_call, /* tp_call */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2660 0, /* tp_str */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2661 (getattrofunc)type_getattro, /* tp_getattro */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2662 (setattrofunc)type_setattro, /* tp_setattro */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2663 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
|
2664 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
|
2665 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
|
2666 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
|
2667 (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
|
2668 (inquiry)type_clear, /* tp_clear */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2669 0, /* tp_richcompare */ |
|
20315
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
2670 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
|
2671 0, /* tp_iter */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2672 0, /* tp_iternext */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2673 type_methods, /* tp_methods */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2674 type_members, /* tp_members */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2675 type_getsets, /* tp_getset */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2676 0, /* tp_base */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2677 0, /* tp_dict */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2678 0, /* tp_descr_get */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2679 0, /* tp_descr_set */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2680 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
|
2681 type_init, /* tp_init */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2682 0, /* tp_alloc */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2683 type_new, /* tp_new */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
2684 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
|
2685 (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
|
2686 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2687 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2688 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2689 /* 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
|
2690 |
|
41281
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2691 /* 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
|
2692 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
|
2693 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2694 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
|
2695 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2696 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
|
2697 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
|
2698 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
|
2699 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2700 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
|
2701 __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
|
2702 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
|
2703 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
|
2704 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
|
2705 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2706 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
|
2707 __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
|
2708 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
|
2709 complaining. |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2710 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2711 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
|
2712 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
|
2713 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
|
2714 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2715 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
|
2716 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
|
2717 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
|
2718 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
|
2719 (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
|
2720 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
|
2721 __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
|
2722 (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
|
2723 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2724 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
|
2725 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
|
2726 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
|
2727 rules. |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2728 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2729 */ |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2730 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2731 /* Forward */ |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2732 static PyObject * |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2733 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
|
2734 |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2735 static int |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2736 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
|
2737 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2738 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
|
2739 (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
|
2740 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2741 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2742 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2743 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
|
2744 { |
|
41281
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2745 int err = 0; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2746 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
|
2747 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
|
2748 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
|
2749 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
|
2750 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2751 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
|
2752 "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
|
2753 1); |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2754 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2755 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
|
2756 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
|
2757 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2758 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
|
2759 "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
|
2760 err = -1; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2761 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2762 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2763 return err; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2764 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2765 |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2766 static PyObject * |
|
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2767 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
|
2768 { |
|
41281
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2769 int err = 0; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2770 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
|
2771 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
|
2772 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
|
2773 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2774 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
|
2775 "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
|
2776 1); |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2777 } |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2778 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
|
2779 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
|
2780 { |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2781 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
|
2782 "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
|
2783 err = -1; |
|
8debce2c4fb1
- Bug #1683368: The object.__init__() and object.__new__() methods are
Guido van Rossum <guido@python.org>
parents:
41212
diff
changeset
|
2784 } |
|
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 if (err < 0) |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2787 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
|
2788 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2789 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
|
2790 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
|
2791 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
|
2792 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
|
2793 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
|
2794 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
|
2795 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
|
2796 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
|
2797 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2798 /* 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
|
2799 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
|
2800 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
|
2801 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
|
2802 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
|
2803 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
|
2804 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
|
2805 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
|
2806 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
|
2807 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
|
2808 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
|
2809 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
|
2810 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
|
2811 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
|
2812 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
|
2813 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
|
2814 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
|
2815 comma = PyString_InternFromString(", "); |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2816 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
|
2817 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
|
2818 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2819 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
|
2820 "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
|
2821 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
|
2822 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
|
2823 joined_str = PyString_AsString(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
|
2824 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
|
2825 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
|
2826 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
2827 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
|
2828 "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
|
2829 "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
|
2830 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
|
2831 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
|
2832 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
|
2833 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
|
2834 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
|
2835 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
|
2836 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
|
2837 } |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2838 return type->tp_alloc(type, 0); |
|
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2839 } |
|
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
2840 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2841 static void |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2842 object_dealloc(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2843 { |
|
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
|
2844 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
|
2845 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
2846 |
|
19194
7e9f5c59e9f2
Make dynamic types work as intended. Or at least more so.
Guido van Rossum <guido@python.org>
parents:
19192
diff
changeset
|
2847 static PyObject * |
|
7e9f5c59e9f2
Make dynamic types work as intended. Or at least more so.
Guido van Rossum <guido@python.org>
parents:
19192
diff
changeset
|
2848 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
|
2849 { |
|
19316
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2850 PyTypeObject *type; |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
2851 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
|
2852 |
|
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
|
2853 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
|
2854 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
|
2855 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
|
2856 PyErr_Clear(); |
|
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2857 else if (!PyString_Check(mod)) { |
|
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2858 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
|
2859 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
|
2860 } |
|
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2861 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
|
2862 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
|
2863 return NULL; |
|
f7dc21cb1661
Fix object_repr() to include the module (using the same rules as
Guido van Rossum <guido@python.org>
parents:
19301
diff
changeset
|
2864 if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__")) |
|
20056
33edc99861b9
Fix the baffler that Tim reported: sometimes the repr() of an object
Guido van Rossum <guido@python.org>
parents:
20028
diff
changeset
|
2865 rtn = PyString_FromFormat("<%s.%s object at %p>", |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
2866 PyString_AS_STRING(mod), |
|
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
2867 PyString_AS_STRING(name), |
|
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
2868 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
|
2869 else |
|
20056
33edc99861b9
Fix the baffler that Tim reported: sometimes the repr() of an object
Guido van Rossum <guido@python.org>
parents:
20028
diff
changeset
|
2870 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
|
2871 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
|
2872 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
|
2873 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
|
2874 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
|
2875 } |
|
7e9f5c59e9f2
Make dynamic types work as intended. Or at least more so.
Guido van Rossum <guido@python.org>
parents:
19192
diff
changeset
|
2876 |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2877 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2878 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
|
2879 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2880 unaryfunc f; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2881 |
|
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
|
2882 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
|
2883 if (f == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2884 f = object_repr; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2885 return f(self); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2886 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
2887 |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2888 static PyObject * |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2889 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
|
2890 { |
|
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
|
2891 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
|
2892 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
|
2893 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2894 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2895 static int |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2896 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
|
2897 { |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2898 return a == b || |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2899 (a != NULL && |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2900 b != NULL && |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2901 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
|
2902 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
|
2903 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
|
2904 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
|
2905 ((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
|
2906 (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
|
2907 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2908 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2909 static int |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2910 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
|
2911 { |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2912 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
|
2913 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
|
2914 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
|
2915 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2916 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
|
2917 return 0; |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2918 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
|
2919 return 1; |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2920 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
|
2921 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
|
2922 size += sizeof(PyObject *); |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2923 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
|
2924 size += sizeof(PyObject *); |
|
41212
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2925 |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2926 /* Check slots compliance */ |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2927 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
|
2928 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
|
2929 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
|
2930 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
|
2931 return 0; |
|
c57cd546612d
Patch #1623563: allow __class__ assignment for classes with __slots__.
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41201
diff
changeset
|
2932 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
|
2933 } |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2934 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
|
2935 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2936 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2937 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
|
2938 compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, char* attr) |
| 26421 | 2939 { |
| 2940 PyTypeObject *newbase, *oldbase; | |
| 2941 | |
|
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
|
2942 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
|
2943 newto->tp_free != oldto->tp_free) |
| 26421 | 2944 { |
| 2945 PyErr_Format(PyExc_TypeError, | |
| 2946 "%s assignment: " | |
| 2947 "'%s' deallocator differs from '%s'", | |
| 2948 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
|
2949 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
|
2950 oldto->tp_name); |
| 26421 | 2951 return 0; |
| 2952 } | |
|
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
|
2953 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
|
2954 oldbase = oldto; |
| 26421 | 2955 while (equiv_structs(newbase, newbase->tp_base)) |
| 2956 newbase = newbase->tp_base; | |
| 2957 while (equiv_structs(oldbase, oldbase->tp_base)) | |
| 2958 oldbase = oldbase->tp_base; | |
| 2959 if (newbase != oldbase && | |
| 2960 (newbase->tp_base != oldbase->tp_base || | |
| 2961 !same_slots_added(newbase, oldbase))) { | |
| 2962 PyErr_Format(PyExc_TypeError, | |
| 2963 "%s assignment: " | |
| 2964 "'%s' object layout differs from '%s'", | |
| 2965 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
|
2966 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
|
2967 oldto->tp_name); |
| 26421 | 2968 return 0; |
| 2969 } | |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
2970 |
| 26421 | 2971 return 1; |
| 2972 } | |
| 2973 | |
| 2974 static int | |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2975 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
|
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 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
|
2978 PyTypeObject *newto; |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2979 |
|
23037
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
2980 if (value == NULL) { |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
2981 PyErr_SetString(PyExc_TypeError, |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
2982 "can't delete __class__ attribute"); |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
2983 return -1; |
|
89db9e3f35a7
SF bug #541883 (Vincent Fiack).
Guido van Rossum <guido@python.org>
parents:
22980
diff
changeset
|
2984 } |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2985 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
|
2986 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
|
2987 "__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
|
2988 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
|
2989 return -1; |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
2990 } |
|
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
|
2991 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
|
2992 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
|
2993 !(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
|
2994 { |
|
3b8a707b41c4
Disallow class assignment completely unless both old and new are heap
Guido van Rossum <guido@python.org>
parents:
24685
diff
changeset
|
2995 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
|
2996 "__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
|
2997 return -1; |
|
3b8a707b41c4
Disallow class assignment completely unless both old and new are heap
Guido van Rossum <guido@python.org>
parents:
24685
diff
changeset
|
2998 } |
|
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
|
2999 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
|
3000 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
|
3001 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
|
3002 Py_DECREF(oldto); |
| 26421 | 3003 return 0; |
| 3004 } | |
| 3005 else { | |
|
23541
f6ded6efabcf
Add a safeguard against setting the class to something with a
Guido van Rossum <guido@python.org>
parents:
23127
diff
changeset
|
3006 return -1; |
|
f6ded6efabcf
Add a safeguard against setting the class to something with a
Guido van Rossum <guido@python.org>
parents:
23127
diff
changeset
|
3007 } |
|
20075
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3008 } |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3009 |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3010 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
|
3011 {"__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
|
3012 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
|
3013 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3014 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3015 |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3016 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3017 /* Stuff to implement __reduce_ex__ for pickle protocols >= 2. |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3018 We fall back to helpers in copy_reg for: |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3019 - pickle protocols < 2 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3020 - 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
|
3021 - 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
|
3022 */ |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3023 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3024 static PyObject * |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3025 import_copy_reg(void) |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3026 { |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3027 static PyObject *copy_reg_str; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3028 |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3029 if (!copy_reg_str) { |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3030 copy_reg_str = PyString_InternFromString("copy_reg"); |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3031 if (copy_reg_str == NULL) |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3032 return NULL; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3033 } |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3034 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3035 return PyImport_Import(copy_reg_str); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3036 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3037 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3038 static PyObject * |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3039 slotnames(PyObject *cls) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3040 { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3041 PyObject *clsdict; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3042 PyObject *copy_reg; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3043 PyObject *slotnames; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3044 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3045 if (!PyType_Check(cls)) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3046 Py_INCREF(Py_None); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3047 return Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3048 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3049 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3050 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
|
3051 slotnames = PyDict_GetItemString(clsdict, "__slotnames__"); |
| 35637 | 3052 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
|
3053 Py_INCREF(slotnames); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3054 return slotnames; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3055 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3056 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3057 copy_reg = import_copy_reg(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3058 if (copy_reg == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3059 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3060 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3061 slotnames = PyObject_CallMethod(copy_reg, "_slotnames", "O", cls); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3062 Py_DECREF(copy_reg); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3063 if (slotnames != NULL && |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3064 slotnames != Py_None && |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3065 !PyList_Check(slotnames)) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3066 { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3067 PyErr_SetString(PyExc_TypeError, |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3068 "copy_reg._slotnames didn't return a list or None"); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3069 Py_DECREF(slotnames); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3070 slotnames = NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3071 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3072 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3073 return slotnames; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3074 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3075 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3076 static PyObject * |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3077 reduce_2(PyObject *obj) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3078 { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3079 PyObject *cls, *getnewargs; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3080 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
|
3081 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
|
3082 PyObject *slots = NULL, *listitems = NULL, *dictitems = NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3083 PyObject *copy_reg = NULL, *newobj = NULL, *res = NULL; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
3084 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
|
3085 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3086 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
|
3087 if (cls == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3088 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3089 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3090 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
|
3091 if (getnewargs != NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3092 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
|
3093 Py_DECREF(getnewargs); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3094 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
|
3095 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
|
3096 "__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
|
3097 "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
|
3098 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3099 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3100 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3101 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3102 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3103 args = PyTuple_New(0); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3104 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3105 if (args == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3106 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3107 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3108 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
|
3109 if (getstate != NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3110 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
|
3111 Py_DECREF(getstate); |
|
29382
585e303a9491
Fix SF #749831, copy raises SystemError when getstate raises exception
Neal Norwitz <nnorwitz@gmail.com>
parents:
29308
diff
changeset
|
3112 if (state == NULL) |
|
585e303a9491
Fix SF #749831, copy raises SystemError when getstate raises exception
Neal Norwitz <nnorwitz@gmail.com>
parents:
29308
diff
changeset
|
3113 goto end; |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3114 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3115 else { |
|
31477
ba9aaddeb956
Fixed a bug in object.__reduce_ex__ (reduce_2) when using protocol
Jim Fulton <jim@zope.com>
parents:
31176
diff
changeset
|
3116 PyErr_Clear(); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3117 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
|
3118 if (state == NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3119 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3120 state = Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3121 Py_INCREF(state); |
|
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 names = slotnames(cls); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3124 if (names == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3125 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3126 if (names != Py_None) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3127 assert(PyList_Check(names)); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3128 slots = PyDict_New(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3129 if (slots == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3130 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3131 n = 0; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3132 /* 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
|
3133 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
|
3134 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
|
3135 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
|
3136 PyObject *name, *value; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3137 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
|
3138 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
|
3139 if (value == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3140 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3141 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3142 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
|
3143 value); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3144 Py_DECREF(value); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3145 if (err) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3146 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3147 n++; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3148 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3149 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3150 if (n) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3151 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
|
3152 if (state == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3153 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3154 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3155 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3156 } |
|
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 if (!PyList_Check(obj)) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3159 listitems = Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3160 Py_INCREF(listitems); |
|
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 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3163 listitems = PyObject_GetIter(obj); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3164 if (listitems == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3165 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3166 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3167 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3168 if (!PyDict_Check(obj)) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3169 dictitems = Py_None; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3170 Py_INCREF(dictitems); |
|
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 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3173 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
|
3174 if (dictitems == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3175 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3176 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3177 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3178 copy_reg = import_copy_reg(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3179 if (copy_reg == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3180 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3181 newobj = PyObject_GetAttrString(copy_reg, "__newobj__"); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3182 if (newobj == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3183 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3184 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3185 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
|
3186 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
|
3187 if (args2 == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3188 goto end; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3189 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
|
3190 cls = NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3191 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
|
3192 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
|
3193 Py_INCREF(v); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3194 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
|
3195 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3196 |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
3197 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
|
3198 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3199 end: |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3200 Py_XDECREF(cls); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3201 Py_XDECREF(args); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3202 Py_XDECREF(args2); |
| 28566 | 3203 Py_XDECREF(slots); |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3204 Py_XDECREF(state); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3205 Py_XDECREF(names); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3206 Py_XDECREF(listitems); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3207 Py_XDECREF(dictitems); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3208 Py_XDECREF(copy_reg); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3209 Py_XDECREF(newobj); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3210 return res; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3211 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3212 |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3213 /* |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3214 * 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
|
3215 * 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
|
3216 * - 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
|
3217 * 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
|
3218 * 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
|
3219 * - 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
|
3220 * __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
|
3221 * 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
|
3222 * |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3223 * 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
|
3224 * 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
|
3225 * 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
|
3226 * function. |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3227 */ |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3228 static PyObject * |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3229 _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
|
3230 { |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3231 PyObject *copy_reg, *res; |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3232 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3233 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
|
3234 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
|
3235 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3236 copy_reg = import_copy_reg(); |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3237 if (!copy_reg) |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3238 return NULL; |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3239 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3240 res = PyEval_CallMethod(copy_reg, "_reduce_ex", "(Oi)", self, proto); |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3241 Py_DECREF(copy_reg); |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3242 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3243 return res; |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3244 } |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3245 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3246 static PyObject * |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3247 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
|
3248 { |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3249 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
|
3250 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3251 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
|
3252 return NULL; |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3253 |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3254 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
|
3255 } |
|
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3256 |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3257 static PyObject * |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3258 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
|
3259 { |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3260 PyObject *reduce, *res; |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3261 int proto = 0; |
|
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 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
|
3264 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3265 |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3266 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
|
3267 if (reduce == NULL) |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3268 PyErr_Clear(); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3269 else { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3270 PyObject *cls, *clsreduce, *objreduce; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3271 int override; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3272 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
|
3273 if (cls == NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3274 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3275 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3276 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3277 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
|
3278 Py_DECREF(cls); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3279 if (clsreduce == NULL) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3280 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3281 return NULL; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3282 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3283 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
|
3284 "__reduce__"); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3285 override = (clsreduce != objreduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3286 Py_DECREF(clsreduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3287 if (override) { |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3288 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
|
3289 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3290 return res; |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3291 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3292 else |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3293 Py_DECREF(reduce); |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3294 } |
|
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3295 |
|
41201
4217f3850f0b
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
Žiga Seilnacht <ziga.seilnacht@gmail.com>
parents:
41188
diff
changeset
|
3296 return _common_reduce(self, proto); |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3297 } |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3298 |
|
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
|
3299 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
|
3300 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
|
3301 { |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3302 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
|
3303 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
|
3304 } |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3305 |
|
6592e5a90c2c
Move abc._Abstract into object by adding a new flag Py_TPFLAGS_IS_ABSTRACT,
Jeffrey Yasskin <jyasskin@gmail.com>
parents:
45381
diff
changeset
|
3306 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
|
3307 "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
|
3308 "\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
|
3309 "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
|
3310 "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
|
3311 "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
|
3312 "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
|
3313 |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3314 /* |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3315 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
|
3316 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3317 class object: |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3318 def __format__(self, format_spec): |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3319 if isinstance(format_spec, str): |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3320 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
|
3321 elif isinstance(format_spec, unicode): |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3322 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
|
3323 */ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3324 static PyObject * |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3325 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
|
3326 { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3327 PyObject *format_spec; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3328 PyObject *self_as_str = NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3329 PyObject *result = NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3330 PyObject *format_meth = NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3331 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3332 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
|
3333 return NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3334 if (PyUnicode_Check(format_spec)) { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3335 self_as_str = PyObject_Unicode(self); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3336 } else if (PyString_Check(format_spec)) { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3337 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
|
3338 } else { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3339 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
|
3340 return NULL; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3341 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3342 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3343 if (self_as_str != NULL) { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3344 /* find the format function */ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3345 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
|
3346 if (format_meth != NULL) { |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3347 /* and call it */ |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3348 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
|
3349 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3350 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3351 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3352 Py_XDECREF(self_as_str); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3353 Py_XDECREF(format_meth); |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3354 |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3355 return result; |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3356 } |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3357 |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3358 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
|
3359 {"__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
|
3360 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
|
3361 {"__reduce__", object_reduce, METH_VARARGS, |
|
24795
452d6a916196
Allow more docstrings to be removed during compilation
Neal Norwitz <nnorwitz@gmail.com>
parents:
24789
diff
changeset
|
3362 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
|
3363 {"__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
|
3364 object_subclasshook_doc}, |
|
45381
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3365 {"__format__", object_format, METH_VARARGS, |
|
b7231bf6bfb7
Backport of PEP 3101, Advanced String Formatting, from py3k.
Eric Smith <eric@trueblade.com>
parents:
45025
diff
changeset
|
3366 PyDoc_STR("default object formatter")}, |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3367 {0} |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3368 }; |
|
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3369 |
|
28016
b849482c70c6
Implementing the salient parts of __reduce_ex__ in C.
Guido van Rossum <guido@python.org>
parents:
27948
diff
changeset
|
3370 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3371 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
|
3372 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
|
3373 "object", /* tp_name */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3374 sizeof(PyObject), /* tp_basicsize */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3375 0, /* tp_itemsize */ |
|
37304
79a0f080f898
Remove unnecessary casts in type object initializers.
Georg Brandl <georg@python.org>
parents:
37067
diff
changeset
|
3376 object_dealloc, /* tp_dealloc */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3377 0, /* tp_print */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3378 0, /* tp_getattr */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3379 0, /* tp_setattr */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3380 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
|
3381 object_repr, /* tp_repr */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3382 0, /* tp_as_number */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3383 0, /* tp_as_sequence */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3384 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
|
3385 (hashfunc)_Py_HashPointer, /* tp_hash */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3386 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
|
3387 object_str, /* tp_str */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3388 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
|
3389 PyObject_GenericSetAttr, /* tp_setattro */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3390 0, /* tp_as_buffer */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3391 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
|
3392 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
|
3393 0, /* tp_traverse */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3394 0, /* tp_clear */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3395 0, /* tp_richcompare */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3396 0, /* tp_weaklistoffset */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3397 0, /* tp_iter */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3398 0, /* tp_iternext */ |
|
20084
48e93ef3c5b7
- Provisional support for pickling new-style objects. (*)
Guido van Rossum <guido@python.org>
parents:
20076
diff
changeset
|
3399 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
|
3400 0, /* tp_members */ |
|
aae5cf7e5861
Make __class__ assignment possible, when the object structures are the
Guido van Rossum <guido@python.org>
parents:
20063
diff
changeset
|
3401 object_getsets, /* tp_getset */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3402 0, /* tp_base */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3403 0, /* tp_dict */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3404 0, /* tp_descr_get */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3405 0, /* tp_descr_set */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3406 0, /* tp_dictoffset */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3407 object_init, /* tp_init */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3408 PyType_GenericAlloc, /* tp_alloc */ |
|
27866
bbbba0ee61fb
SF patch #685738 by Michael Stone.
Guido van Rossum <guido@python.org>
parents:
27831
diff
changeset
|
3409 object_new, /* tp_new */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3410 PyObject_Del, /* tp_free */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3411 }; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3412 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3413 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3414 /* 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
|
3415 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3416 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3417 add_methods(PyTypeObject *type, PyMethodDef *meth) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3418 { |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3419 PyObject *dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3420 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3421 for (; meth->ml_name != NULL; meth++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3422 PyObject *descr; |
|
31172
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
30917
diff
changeset
|
3423 if (PyDict_GetItemString(dict, meth->ml_name) && |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
30917
diff
changeset
|
3424 !(meth->ml_flags & METH_COEXIST)) |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
30917
diff
changeset
|
3425 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
|
3426 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
|
3427 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
|
3428 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
|
3429 "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
|
3430 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
|
3431 } |
|
26583
8991f78817c7
SF 548651: Fix the METH_CLASS implementation.
Tim Peters <tim.peters@gmail.com>
parents:
26575
diff
changeset
|
3432 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
|
3433 } |
|
ddc9543c76a0
Introduce two new flag bits that can be set in a PyMethodDef method
Fred Drake <fdrake@acm.org>
parents:
22348
diff
changeset
|
3434 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
|
3435 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
|
3436 if (cfunc == NULL) |
|
48dc4a59a50e
Inline create_specialmethod() -- since METH_CLASS is done differently
Guido van Rossum <guido@python.org>
parents:
27811
diff
changeset
|
3437 return -1; |
|
48dc4a59a50e
Inline create_specialmethod() -- since METH_CLASS is done differently
Guido van Rossum <guido@python.org>
parents:
27811
diff
changeset
|
3438 descr = PyStaticMethod_New(cfunc); |
|
48dc4a59a50e
Inline create_specialmethod() -- since METH_CLASS is done differently
Guido van Rossum <guido@python.org>
parents:
27811
diff
changeset
|
3439 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
|
3440 } |
|
ddc9543c76a0
Introduce two new flag bits that can be set in a PyMethodDef method
Fred Drake <fdrake@acm.org>
parents:
22348
diff
changeset
|
3441 else { |
|
ddc9543c76a0
Introduce two new flag bits that can be set in a PyMethodDef method
Fred Drake <fdrake@acm.org>
parents:
22348
diff
changeset
|
3442 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
|
3443 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3444 if (descr == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3445 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
|
3446 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
|
3447 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3448 Py_DECREF(descr); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3449 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3450 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3451 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3452 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3453 static int |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
3454 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
|
3455 { |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3456 PyObject *dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3457 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3458 for (; memb->name != NULL; memb++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3459 PyObject *descr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3460 if (PyDict_GetItemString(dict, memb->name)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3461 continue; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3462 descr = PyDescr_NewMember(type, memb); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3463 if (descr == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3464 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3465 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
|
3466 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3467 Py_DECREF(descr); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3468 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3469 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3470 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3471 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3472 static int |
|
20015
ca7af2a5d915
Add optional docstrings to getset descriptors. Fortunately, there's
Guido van Rossum <guido@python.org>
parents:
20012
diff
changeset
|
3473 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
|
3474 { |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3475 PyObject *dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3476 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3477 for (; gsp->name != NULL; gsp++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3478 PyObject *descr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3479 if (PyDict_GetItemString(dict, gsp->name)) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3480 continue; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3481 descr = PyDescr_NewGetSet(type, gsp); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3482 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3483 if (descr == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3484 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3485 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
|
3486 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3487 Py_DECREF(descr); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3488 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3489 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3490 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3491 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3492 static void |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3493 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
|
3494 { |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
3495 Py_ssize_t oldsize, newsize; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3496 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3497 /* 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
|
3498 if (!type->tp_as_buffer && base->tp_as_buffer) { |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3499 type->tp_flags &= ~Py_TPFLAGS_HAVE_GETCHARBUFFER; |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3500 type->tp_flags |= |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3501 base->tp_flags & Py_TPFLAGS_HAVE_GETCHARBUFFER; |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3502 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3503 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
|
3504 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
|
3505 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
|
3506 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3507 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
|
3508 (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
|
3509 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
|
3510 (!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
|
3511 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
|
3512 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
|
3513 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
|
3514 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
|
3515 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3516 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3517 /* Wow */ |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3518 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3519 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
|
3520 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
|
3521 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
|
3522 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3523 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3524 /* 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
|
3525 oldsize = base->tp_basicsize; |
|
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
3526 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
|
3527 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
|
3528 (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
|
3529 (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
|
3530 (!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
|
3531 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
|
3532 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
|
3533 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
|
3534 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
|
3535 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
|
3536 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3537 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
|
3538 /* 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
|
3539 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
|
3540 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
|
3541 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
|
3542 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
|
3543 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
|
3544 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
|
3545 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
|
3546 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
|
3547 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
|
3548 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
|
3549 (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
|
3550 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
|
3551 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
|
3552 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3553 } |
|
19582
13a93a5dcb1d
Use new GC API. Remove usage of BASICSIZE macros.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
19551
diff
changeset
|
3554 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
|
3555 |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3556 /* 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
|
3557 |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3558 #undef COPYVAL |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3559 #define COPYVAL(SLOT) \ |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3560 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
|
3561 |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3562 COPYVAL(tp_itemsize); |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3563 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
|
3564 COPYVAL(tp_weaklistoffset); |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3565 } |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3566 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
|
3567 COPYVAL(tp_dictoffset); |
|
968d169501f2
Non-function fields, like tp_dictoffset and tp_weaklistoffset, should
Guido van Rossum <guido@python.org>
parents:
19194
diff
changeset
|
3568 } |
|
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
|
3569 |
|
d01bd37bf5ce
Variation of patch # 1624059 to speed up checking if an object is a subclass
Neal Norwitz <nnorwitz@gmail.com>
parents:
40777
diff
changeset
|
3570 /* 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
|
3571 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
|
3572 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
|
3573 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
|
3574 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
|
3575 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
|
3576 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
|
3577 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
|
3578 type->tp_flags |= Py_TPFLAGS_LONG_SUBCLASS; |
|
d01bd37bf5ce
Variation of patch # 1624059 to speed up checking if an object is a subclass
Neal Norwitz <nnorwitz@gmail.com>
parents:
40777
diff
changeset
|
3579 else if (PyType_IsSubtype(base, &PyString_Type)) |
|
d01bd37bf5ce
Variation of patch # 1624059 to speed up checking if an object is a subclass
Neal Norwitz <nnorwitz@gmail.com>
parents:
40777
diff
changeset
|
3580 type->tp_flags |= Py_TPFLAGS_STRING_SUBCLASS; |
|
44572
db5e01c33eb7
Make Python compile with --disable-unicode.
Georg Brandl <georg@python.org>
parents:
44365
diff
changeset
|
3581 #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
|
3582 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
|
3583 type->tp_flags |= Py_TPFLAGS_UNICODE_SUBCLASS; |
|
44572
db5e01c33eb7
Make Python compile with --disable-unicode.
Georg Brandl <georg@python.org>
parents:
44365
diff
changeset
|
3584 #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
|
3585 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
|
3586 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
|
3587 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
|
3588 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
|
3589 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
|
3590 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
|
3591 } |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3592 |
|
44357
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3593 static char *hash_name_op[] = { |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3594 "__eq__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3595 "__cmp__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3596 "__hash__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3597 NULL |
|
43958
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3598 }; |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3599 |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3600 static int |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3601 overrides_hash(PyTypeObject *type) |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3602 { |
|
44357
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3603 char **p; |
|
43958
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3604 PyObject *dict = type->tp_dict; |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3605 |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3606 assert(dict != NULL); |
|
44357
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3607 for (p = hash_name_op; *p; p++) { |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
3608 if (PyDict_GetItemString(dict, *p) != NULL) |
|
43958
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3609 return 1; |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3610 } |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3611 return 0; |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3612 } |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3613 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3614 static void |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3615 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
|
3616 { |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3617 PyTypeObject *basebase; |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3618 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3619 #undef SLOTDEFINED |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3620 #undef COPYSLOT |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3621 #undef COPYNUM |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3622 #undef COPYSEQ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3623 #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
|
3624 #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
|
3625 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3626 #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
|
3627 (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
|
3628 (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
|
3629 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3630 #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
|
3631 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
|
3632 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3633 #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
|
3634 #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
|
3635 #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
|
3636 #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
|
3637 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3638 /* 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
|
3639 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
|
3640 |
|
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3641 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
|
3642 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
|
3643 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
|
3644 basebase = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3645 COPYNUM(nb_add); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3646 COPYNUM(nb_subtract); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3647 COPYNUM(nb_multiply); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3648 COPYNUM(nb_divide); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3649 COPYNUM(nb_remainder); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3650 COPYNUM(nb_divmod); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3651 COPYNUM(nb_power); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3652 COPYNUM(nb_negative); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3653 COPYNUM(nb_positive); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3654 COPYNUM(nb_absolute); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3655 COPYNUM(nb_nonzero); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3656 COPYNUM(nb_invert); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3657 COPYNUM(nb_lshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3658 COPYNUM(nb_rshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3659 COPYNUM(nb_and); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3660 COPYNUM(nb_xor); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3661 COPYNUM(nb_or); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3662 COPYNUM(nb_coerce); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3663 COPYNUM(nb_int); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3664 COPYNUM(nb_long); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3665 COPYNUM(nb_float); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3666 COPYNUM(nb_oct); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3667 COPYNUM(nb_hex); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3668 COPYNUM(nb_inplace_add); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3669 COPYNUM(nb_inplace_subtract); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3670 COPYNUM(nb_inplace_multiply); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3671 COPYNUM(nb_inplace_divide); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3672 COPYNUM(nb_inplace_remainder); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3673 COPYNUM(nb_inplace_power); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3674 COPYNUM(nb_inplace_lshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3675 COPYNUM(nb_inplace_rshift); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3676 COPYNUM(nb_inplace_and); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3677 COPYNUM(nb_inplace_xor); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3678 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
|
3679 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
|
3680 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
|
3681 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
|
3682 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
|
3683 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
|
3684 } |
|
36882
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
3685 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
|
3686 COPYNUM(nb_index); |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
3687 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3688 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3689 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3690 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
|
3691 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
|
3692 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
|
3693 basebase = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3694 COPYSEQ(sq_length); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3695 COPYSEQ(sq_concat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3696 COPYSEQ(sq_repeat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3697 COPYSEQ(sq_item); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3698 COPYSEQ(sq_slice); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3699 COPYSEQ(sq_ass_item); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3700 COPYSEQ(sq_ass_slice); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3701 COPYSEQ(sq_contains); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3702 COPYSEQ(sq_inplace_concat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3703 COPYSEQ(sq_inplace_repeat); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3704 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3705 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3706 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
|
3707 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
|
3708 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
|
3709 basebase = NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3710 COPYMAP(mp_length); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3711 COPYMAP(mp_subscript); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3712 COPYMAP(mp_ass_subscript); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3713 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3714 |
|
20384
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3715 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
|
3716 basebase = base->tp_base; |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3717 if (basebase->tp_as_buffer == NULL) |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3718 basebase = NULL; |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3719 COPYBUF(bf_getreadbuffer); |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3720 COPYBUF(bf_getwritebuffer); |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3721 COPYBUF(bf_getsegcount); |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3722 COPYBUF(bf_getcharbuffer); |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3723 } |
|
2ba4018de2e3
SF bug [#470040] ParseTuple t# vs subclasses.
Tim Peters <tim.peters@gmail.com>
parents:
20382
diff
changeset
|
3724 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3725 basebase = base->tp_base; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3726 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3727 COPYSLOT(tp_dealloc); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3728 COPYSLOT(tp_print); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3729 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
|
3730 type->tp_getattr = base->tp_getattr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3731 type->tp_getattro = base->tp_getattro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3732 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3733 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
|
3734 type->tp_setattr = base->tp_setattr; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3735 type->tp_setattro = base->tp_setattro; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3736 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3737 /* tp_compare see tp_richcompare */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3738 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
|
3739 /* tp_hash see tp_richcompare */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3740 COPYSLOT(tp_call); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3741 COPYSLOT(tp_str); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3742 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
|
3743 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
|
3744 type->tp_richcompare == NULL && |
|
43958
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3745 type->tp_hash == NULL && |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3746 !overrides_hash(type)) |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
3747 { |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3748 type->tp_compare = base->tp_compare; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3749 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
|
3750 type->tp_hash = base->tp_hash; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3751 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3752 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3753 else { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3754 COPYSLOT(tp_compare); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3755 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3756 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
|
3757 COPYSLOT(tp_iter); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3758 COPYSLOT(tp_iternext); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3759 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3760 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
|
3761 COPYSLOT(tp_descr_get); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3762 COPYSLOT(tp_descr_set); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3763 COPYSLOT(tp_dictoffset); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3764 COPYSLOT(tp_init); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3765 COPYSLOT(tp_alloc); |
|
22848
e589e473f232
Inherit tp_new and tp_is_gc.
Guido van Rossum <guido@python.org>
parents:
22834
diff
changeset
|
3766 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
|
3767 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
|
3768 (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
|
3769 /* 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
|
3770 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
|
3771 } |
|
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
|
3772 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
|
3773 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
|
3774 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
|
3775 /* 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
|
3776 * 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
|
3777 * 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
|
3778 * 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
|
3779 */ |
|
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
|
3780 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
|
3781 } |
|
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
|
3782 /* 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
|
3783 * 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
|
3784 */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3785 } |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3786 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3787 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
3788 static int add_operators(PyTypeObject *); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3789 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3790 int |
|
19040
4df72ea78ae8
- Rename PyType_InitDict() to PyType_Ready().
Guido van Rossum <guido@python.org>
parents:
19036
diff
changeset
|
3791 PyType_Ready(PyTypeObject *type) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3792 { |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
3793 PyObject *dict, *bases; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3794 PyTypeObject *base; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
3795 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3796 |
|
23756
8e5f26796620
Undo the last chunk of the previous patch, putting back a useful
Guido van Rossum <guido@python.org>
parents:
23755
diff
changeset
|
3797 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
|
3798 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
|
3799 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
|
3800 } |
|
19136
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
3801 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
|
3802 |
|
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
3803 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
|
3804 |
|
28389
4ede57a42c62
Refactored some of the Py_TRACE_REFS code. New private API function
Tim Peters <tim.peters@gmail.com>
parents:
28288
diff
changeset
|
3805 #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
|
3806 /* 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
|
3807 * 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
|
3808 * 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
|
3809 * 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
|
3810 */ |
|
28396
d56282c28a1e
Improved new Py_TRACE_REFS gimmicks.
Tim Peters <tim.peters@gmail.com>
parents:
28390
diff
changeset
|
3811 _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
|
3812 #endif |
|
4ede57a42c62
Refactored some of the Py_TRACE_REFS code. New private API function
Tim Peters <tim.peters@gmail.com>
parents:
28288
diff
changeset
|
3813 |
|
22871
252438bb05d9
- A type can now inherit its metatype from its base type. Previously,
Guido van Rossum <guido@python.org>
parents:
22859
diff
changeset
|
3814 /* 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
|
3815 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
|
3816 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
|
3817 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
|
3818 Py_INCREF(base); |
|
f6fa649fc4af
Patch #980082: Missing INCREF in PyType_Ready.
Martin v. Löwis <martin@v.loewis.de>
parents:
32916
diff
changeset
|
3819 } |
|
22871
252438bb05d9
- A type can now inherit its metatype from its base type. Previously,
Guido van Rossum <guido@python.org>
parents:
22859
diff
changeset
|
3820 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3821 /* 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
|
3822 * &PyBaseObject_Type. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3823 */ |
|
36925
7c17e9221f94
Fix three nits found by Coverity, adding null checks and comments.
Guido van Rossum <guido@python.org>
parents:
36882
diff
changeset
|
3824 |
|
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
|
3825 /* 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
|
3826 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
|
3827 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
|
3828 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
|
3829 } |
|
c001e5a15369
PyType_Ready(): initialize the base class a bit earlier, so that if we
Guido van Rossum <guido@python.org>
parents:
24795
diff
changeset
|
3830 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3831 /* 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
|
3832 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
|
3833 initializing the ob_type field of their type objects. */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3834 /* 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
|
3835 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
|
3836 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
|
3837 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
|
3838 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
|
3839 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
|
3840 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3841 /* Initialize tp_bases */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3842 bases = type->tp_bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3843 if (bases == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3844 if (base == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3845 bases = PyTuple_New(0); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3846 else |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
3847 bases = PyTuple_Pack(1, base); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3848 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
|
3849 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3850 type->tp_bases = bases; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3851 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3852 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3853 /* 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
|
3854 dict = type->tp_dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3855 if (dict == NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3856 dict = PyDict_New(); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3857 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
|
3858 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
|
3859 type->tp_dict = dict; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3860 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3861 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
3862 /* 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
|
3863 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
|
3864 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3865 if (type->tp_methods != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3866 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
|
3867 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3868 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3869 if (type->tp_members != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3870 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
|
3871 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3872 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3873 if (type->tp_getset != NULL) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3874 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
|
3875 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3876 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3877 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3878 /* Calculate method resolution order */ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3879 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
|
3880 goto error; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3881 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3882 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3883 /* 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
|
3884 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
|
3885 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
|
3886 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3887 /* Initialize tp_dict properly */ |
|
20439
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
3888 bases = type->tp_mro; |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
3889 assert(bases != NULL); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
3890 assert(PyTuple_Check(bases)); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
3891 n = PyTuple_GET_SIZE(bases); |
|
85571d5f6545
Completely get rid of __dynamic__ and the corresponding
Guido van Rossum <guido@python.org>
parents:
20436
diff
changeset
|
3892 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
|
3893 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
|
3894 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
|
3895 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
|
3896 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3897 |
|
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
|
3898 /* 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
|
3899 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
|
3900 (type->tp_free == NULL || type->tp_free == PyObject_Del)) { |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3901 /* 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
|
3902 * one, or its tp_free is for non-gc'ed objects. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
3903 */ |
|
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
|
3904 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
|
3905 "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
|
3906 "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
|
3907 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
|
3908 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
|
3909 } |
|
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
|
3910 |
|
21997
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3911 /* 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
|
3912 the tp_doc slot. |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3913 */ |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3914 if (PyDict_GetItemString(type->tp_dict, "__doc__") == NULL) { |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3915 if (type->tp_doc != NULL) { |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3916 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
|
3917 if (doc == NULL) |
|
f2031f15d99d
Handle allocation failures gracefully. Found with failmalloc.
Neal Norwitz <nnorwitz@gmail.com>
parents:
38919
diff
changeset
|
3918 goto error; |
|
21997
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3919 PyDict_SetItemString(type->tp_dict, "__doc__", doc); |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3920 Py_DECREF(doc); |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3921 } else { |
|
22774
02fddf7c25c2
Fold some long lines. Delete blank initial line.
Guido van Rossum <guido@python.org>
parents:
22770
diff
changeset
|
3922 PyDict_SetItemString(type->tp_dict, |
|
02fddf7c25c2
Fold some long lines. Delete blank initial line.
Guido van Rossum <guido@python.org>
parents:
22770
diff
changeset
|
3923 "__doc__", Py_None); |
|
21997
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3924 } |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3925 } |
|
cb5b4a54ff12
backport loewis' checkin of
Michael W. Hudson <mwh@python.net>
parents:
21451
diff
changeset
|
3926 |
|
43958
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3927 /* Hack for tp_hash and __hash__. |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3928 If after all that, tp_hash is still NULL, and __hash__ is not in |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3929 tp_dict, set tp_dict['__hash__'] equal to None. |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3930 This signals that __hash__ is not inherited. |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3931 */ |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3932 if (type->tp_hash == NULL && |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3933 PyDict_GetItemString(type->tp_dict, "__hash__") == NULL && |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3934 PyDict_SetItemString(type->tp_dict, "__hash__", Py_None) < 0) |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3935 { |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3936 goto error; |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3937 } |
|
103b7f955036
Backport of _abccoll.py by Benjamin Arangueren, issue 1383.
Guido van Rossum <guido@python.org>
parents:
43276
diff
changeset
|
3938 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3939 /* 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
|
3940 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
|
3941 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
|
3942 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
|
3943 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
|
3944 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
|
3945 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
|
3946 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
|
3947 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
|
3948 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
|
3949 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
|
3950 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3951 |
|
20315
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
3952 /* 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
|
3953 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
|
3954 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
|
3955 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
|
3956 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
|
3957 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
|
3958 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
|
3959 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
|
3960 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
3961 |
|
19153
64d4ad73a887
- Big changes to fix SF bug #442833 (a nasty multiple inheritance
Guido van Rossum <guido@python.org>
parents:
19136
diff
changeset
|
3962 /* 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
|
3963 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
|
3964 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
|
3965 (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
|
3966 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
|
3967 |
|
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
3968 error: |
|
6463cd9db2fc
Change PyType_Ready() to use the READY and READYING flags. This makes
Guido van Rossum <guido@python.org>
parents:
19109
diff
changeset
|
3969 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
|
3970 return -1; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3971 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
3972 |
|
20315
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
3973 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
|
3974 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
|
3975 { |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
3976 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
|
3977 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
|
3978 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
|
3979 |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
3980 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
|
3981 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
|
3982 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
|
3983 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
|
3984 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
|
3985 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
3986 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
|
3987 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
|
3988 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
|
3989 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
|
3990 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
|
3991 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
|
3992 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
|
3993 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
|
3994 } |
|
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
|
3995 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
|
3996 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
|
3997 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
|
3998 } |
|
7b41f7a2e528
Keep track of a type's subclasses (subtypes), in tp_subclasses, which
Guido van Rossum <guido@python.org>
parents:
20296
diff
changeset
|
3999 |
| 26421 | 4000 static void |
| 4001 remove_subclass(PyTypeObject *base, PyTypeObject *type) | |
| 4002 { | |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4003 Py_ssize_t i; |
| 26421 | 4004 PyObject *list, *ref; |
| 4005 | |
| 4006 list = base->tp_subclasses; | |
| 4007 if (list == NULL) { | |
| 4008 return; | |
| 4009 } | |
| 4010 assert(PyList_Check(list)); | |
| 4011 i = PyList_GET_SIZE(list); | |
| 4012 while (--i >= 0) { | |
| 4013 ref = PyList_GET_ITEM(list, i); | |
| 4014 assert(PyWeakref_CheckRef(ref)); | |
| 4015 if (PyWeakref_GET_OBJECT(ref) == (PyObject*)type) { | |
| 4016 /* this can't fail, right? */ | |
| 4017 PySequence_DelItem(list, i); | |
| 4018 return; | |
| 4019 } | |
| 4020 } | |
| 4021 } | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4022 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4023 static int |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4024 check_num_args(PyObject *ob, int n) |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4025 { |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4026 if (!PyTuple_CheckExact(ob)) { |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4027 PyErr_SetString(PyExc_SystemError, |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4028 "PyArg_UnpackTuple() argument list is not a tuple"); |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4029 return 0; |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4030 } |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4031 if (n == PyTuple_GET_SIZE(ob)) |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4032 return 1; |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4033 PyErr_Format( |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4034 PyExc_TypeError, |
|
36510
0f3894bb2ada
Support %zd in PyErr_Format and PyString_FromFormat.
Martin v. Löwis <martin@v.loewis.de>
parents:
36501
diff
changeset
|
4035 "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
|
4036 return 0; |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4037 } |
|
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4038 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4039 /* 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
|
4040 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4041 /* 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
|
4042 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
|
4043 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
|
4044 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
|
4045 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
|
4046 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4047 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4048 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
|
4049 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4050 lenfunc func = (lenfunc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4051 Py_ssize_t res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4052 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4053 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
|
4054 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4055 res = (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4056 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4057 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4058 return PyInt_FromLong((long)res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4059 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4060 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4061 static PyObject * |
|
30670
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4062 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
|
4063 { |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4064 inquiry func = (inquiry)wrapped; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4065 int res; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4066 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4067 if (!check_num_args(args, 0)) |
|
30670
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4068 return NULL; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4069 res = (*func)(self); |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4070 if (res == -1 && PyErr_Occurred()) |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4071 return NULL; |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4072 return PyBool_FromLong((long)res); |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4073 } |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4074 |
|
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
4075 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4076 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
|
4077 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4078 binaryfunc func = (binaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4079 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4080 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4081 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
|
4082 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4083 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
|
4084 return (*func)(self, other); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4085 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4086 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4087 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
|
4088 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
|
4089 { |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4090 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
|
4091 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
|
4092 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4093 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
|
4094 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4095 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
|
4096 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
|
4097 !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
|
4098 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
|
4099 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
|
4100 } |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4101 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
|
4102 } |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4103 |
|
26b5f8b94872
It turned out not so difficult to support old-style numbers (those
Guido van Rossum <guido@python.org>
parents:
20320
diff
changeset
|
4104 static PyObject * |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4105 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
|
4106 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4107 binaryfunc func = (binaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4108 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4109 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4110 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
|
4111 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4112 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
|
4113 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
|
4114 !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
|
4115 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
|
4116 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
|
4117 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4118 return (*func)(other, self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4119 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4120 |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4121 static PyObject * |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4122 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
|
4123 { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4124 coercion func = (coercion)wrapped; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4125 PyObject *other, *res; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4126 int ok; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4127 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4128 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
|
4129 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4130 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
|
4131 ok = func(&self, &other); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4132 if (ok < 0) |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4133 return NULL; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4134 if (ok > 0) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4135 Py_INCREF(Py_NotImplemented); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4136 return Py_NotImplemented; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4137 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4138 res = PyTuple_New(2); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4139 if (res == NULL) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4140 Py_DECREF(self); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4141 Py_DECREF(other); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4142 return NULL; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4143 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4144 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
|
4145 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
|
4146 return res; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4147 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
4148 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4149 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4150 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
|
4151 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4152 ternaryfunc func = (ternaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4153 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4154 PyObject *third = Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4155 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4156 /* 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
|
4157 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4158 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
|
4159 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4160 return (*func)(self, other, third); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4161 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4162 |
|
20168
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4163 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
|
4164 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
|
4165 { |
|
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4166 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
|
4167 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
|
4168 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
|
4169 |
|
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4170 /* 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
|
4171 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4172 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
|
4173 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
|
4174 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
|
4175 } |
|
091e9e3ceeaf
Ouch. The wrapper for __rpow__ was the same as for __pow__, resulting
Guido van Rossum <guido@python.org>
parents:
20140
diff
changeset
|
4176 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4177 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4178 wrap_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
|
4179 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4180 unaryfunc func = (unaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4181 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4182 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
|
4183 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4184 return (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4185 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4186 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4187 static PyObject * |
|
37308
aaa04bfafc58
Minor bugs in the __index__ code (PEP 357), with tests.
Armin Rigo <arigo@tunes.org>
parents:
37304
diff
changeset
|
4188 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
|
4189 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4190 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
|
4191 PyObject* o; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4192 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4193 |
|
37308
aaa04bfafc58
Minor bugs in the __index__ code (PEP 357), with tests.
Armin Rigo <arigo@tunes.org>
parents:
37304
diff
changeset
|
4194 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
|
4195 return NULL; |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
4196 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
|
4197 if (i == -1 && PyErr_Occurred()) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4198 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4199 return (*func)(self, i); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4200 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4201 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4202 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
|
4203 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
|
4204 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4205 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4206 |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
4207 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
|
4208 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
|
4209 return -1; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4210 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
|
4211 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
|
4212 if (sq && sq->sq_length) { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4213 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
|
4214 if (n < 0) |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4215 return -1; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4216 i += n; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4217 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4218 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4219 return i; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4220 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4221 |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4222 static PyObject * |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4223 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
|
4224 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4225 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
|
4226 PyObject *arg; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4227 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
|
4228 |
|
20229
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4229 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
|
4230 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
|
4231 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
|
4232 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
|
4233 return NULL; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4234 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
|
4235 } |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4236 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
|
4237 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
|
4238 return NULL; |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4239 } |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4240 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4241 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4242 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
|
4243 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4244 ssizessizeargfunc func = (ssizessizeargfunc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4245 Py_ssize_t i, j; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4246 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4247 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
|
4248 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4249 return (*func)(self, i, j); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4250 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4251 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4252 static PyObject * |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4253 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
|
4254 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4255 ssizeobjargproc func = (ssizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4256 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4257 int res; |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4258 PyObject *arg, *value; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4259 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4260 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
|
4261 return NULL; |
|
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4262 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
|
4263 if (i == -1 && PyErr_Occurred()) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4264 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4265 res = (*func)(self, i, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4266 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4267 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4268 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4269 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4270 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4271 |
|
18941
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4272 static PyObject * |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4273 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
|
4274 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4275 ssizeobjargproc func = (ssizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4276 Py_ssize_t i; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4277 int res; |
|
19353
051d8e380f38
Address SF bug #442813. The sequence getitem wrappers should do
Guido van Rossum <guido@python.org>
parents:
19349
diff
changeset
|
4278 PyObject *arg; |
|
18941
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4279 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4280 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
|
4281 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4282 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
|
4283 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
|
4284 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
|
4285 return NULL; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4286 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
|
4287 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
|
4288 return NULL; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4289 Py_INCREF(Py_None); |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4290 return Py_None; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4291 } |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4292 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4293 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4294 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
|
4295 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4296 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4297 Py_ssize_t i, j; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4298 int res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4299 PyObject *value; |
|
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 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
|
4302 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4303 res = (*func)(self, i, j, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4304 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4305 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4306 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4307 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4308 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4309 |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
4310 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
|
4311 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
|
4312 { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4313 ssizessizeobjargproc func = (ssizessizeobjargproc)wrapped; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4314 Py_ssize_t i, j; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4315 int res; |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4316 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4317 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
|
4318 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
|
4319 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
|
4320 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
|
4321 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
|
4322 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
|
4323 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
|
4324 } |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
4325 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4326 /* 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
|
4327 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4328 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
|
4329 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4330 objobjproc func = (objobjproc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4331 int res; |
|
30660
36992ca918a3
Fix leak introduced by previous typeobject.c checkin.
Guido van Rossum <guido@python.org>
parents:
30659
diff
changeset
|
4332 PyObject *value; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4333 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4334 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
|
4335 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4336 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
|
4337 res = (*func)(self, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4338 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4339 return NULL; |
|
30660
36992ca918a3
Fix leak introduced by previous typeobject.c checkin.
Guido van Rossum <guido@python.org>
parents:
30659
diff
changeset
|
4340 else |
|
36992ca918a3
Fix leak introduced by previous typeobject.c checkin.
Guido van Rossum <guido@python.org>
parents:
30659
diff
changeset
|
4341 return PyBool_FromLong(res); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4342 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4343 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4344 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4345 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
|
4346 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4347 objobjargproc func = (objobjargproc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4348 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4349 PyObject *key, *value; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4350 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4351 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
|
4352 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4353 res = (*func)(self, key, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4354 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4355 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4356 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4357 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4358 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4359 |
|
18941
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4360 static PyObject * |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4361 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
|
4362 { |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4363 objobjargproc func = (objobjargproc)wrapped; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4364 int res; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4365 PyObject *key; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4366 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4367 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
|
4368 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4369 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
|
4370 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
|
4371 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
|
4372 return NULL; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4373 Py_INCREF(Py_None); |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4374 return Py_None; |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4375 } |
|
013cffcfd8a3
Fix SF #442791 (revisited): No __delitem__ wrapper was defined.
Guido van Rossum <guido@python.org>
parents:
18933
diff
changeset
|
4376 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4377 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4378 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
|
4379 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4380 cmpfunc func = (cmpfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4381 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4382 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4383 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4384 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
|
4385 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4386 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
|
4387 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
|
4388 !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
|
4389 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
|
4390 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
|
4391 "%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
|
4392 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
|
4393 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
|
4394 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
|
4395 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
|
4396 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4397 res = (*func)(self, other); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4398 if (PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4399 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4400 return PyInt_FromLong((long)res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4401 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4402 |
|
28608
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4403 /* 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
|
4404 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
|
4405 static int |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4406 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
|
4407 { |
|
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
|
4408 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
|
4409 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
|
4410 type = type->tp_base; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4411 /* If type is NULL now, this is a really weird type. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4412 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
|
4413 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
|
4414 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
|
4415 "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
|
4416 what, |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4417 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
|
4418 return 0; |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4419 } |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4420 return 1; |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4421 } |
|
8322077d234c
Close off the "Verre Carlo hack" as discussed on python-dev.
Guido van Rossum <guido@python.org>
parents:
28607
diff
changeset
|
4422 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4423 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4424 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
|
4425 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4426 setattrofunc func = (setattrofunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4427 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4428 PyObject *name, *value; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4429 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4430 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
|
4431 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
|
4432 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
|
4433 return NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4434 res = (*func)(self, name, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4435 if (res < 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4436 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4437 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4438 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4439 } |
|
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 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4442 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
|
4443 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4444 setattrofunc func = (setattrofunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4445 int res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4446 PyObject *name; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4447 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4448 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
|
4449 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4450 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
|
4451 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
|
4452 return NULL; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4453 res = (*func)(self, name, NULL); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4454 if (res < 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4455 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4456 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4457 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4458 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4459 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4460 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4461 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
|
4462 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4463 hashfunc func = (hashfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4464 long res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4465 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4466 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
|
4467 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4468 res = (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4469 if (res == -1 && PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4470 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4471 return PyInt_FromLong(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4472 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4473 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4474 static PyObject * |
|
20599
ff57a1a370b3
Methods of built-in types now properly check for keyword arguments
Guido van Rossum <guido@python.org>
parents:
20595
diff
changeset
|
4475 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
|
4476 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4477 ternaryfunc func = (ternaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4478 |
|
20599
ff57a1a370b3
Methods of built-in types now properly check for keyword arguments
Guido van Rossum <guido@python.org>
parents:
20595
diff
changeset
|
4479 return (*func)(self, args, kwds); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4480 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4481 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4482 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4483 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
|
4484 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4485 richcmpfunc func = (richcmpfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4486 PyObject *other; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4487 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4488 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
|
4489 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4490 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
|
4491 return (*func)(self, other, op); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4492 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4493 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4494 #undef RICHCMP_WRAPPER |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4495 #define RICHCMP_WRAPPER(NAME, OP) \ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4496 static PyObject * \ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4497 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
|
4498 { \ |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4499 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
|
4500 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4501 |
|
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
|
4502 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
|
4503 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
|
4504 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
|
4505 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
|
4506 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
|
4507 RICHCMP_WRAPPER(ge, Py_GE) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4508 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4509 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4510 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
|
4511 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4512 unaryfunc func = (unaryfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4513 PyObject *res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4514 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4515 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
|
4516 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4517 res = (*func)(self); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4518 if (res == NULL && !PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4519 PyErr_SetNone(PyExc_StopIteration); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4520 return res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4521 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4522 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4523 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4524 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
|
4525 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4526 descrgetfunc func = (descrgetfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4527 PyObject *obj; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4528 PyObject *type = NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4529 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4530 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
|
4531 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
|
4532 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
|
4533 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
|
4534 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
|
4535 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
|
4536 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
|
4537 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
|
4538 "__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
|
4539 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
|
4540 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4541 return (*func)(self, obj, type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4542 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4543 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4544 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
|
4545 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
|
4546 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4547 descrsetfunc func = (descrsetfunc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4548 PyObject *obj, *value; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4549 int ret; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4550 |
|
30671
adc60015670a
Use the simpler and faster PyArg_UnpackTuple() instead of
Raymond Hettinger <python@rcn.com>
parents:
30670
diff
changeset
|
4551 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
|
4552 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4553 ret = (*func)(self, obj, value); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4554 if (ret < 0) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4555 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4556 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4557 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4558 } |
|
24614
40eb80dc4250
Fix SF bug 574207 (chained __slots__ dealloc segfault).
Guido van Rossum <guido@python.org>
parents:
24460
diff
changeset
|
4559 |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4560 static PyObject * |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4561 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
|
4562 { |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4563 descrsetfunc func = (descrsetfunc)wrapped; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4564 PyObject *obj; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4565 int ret; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4566 |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4567 if (!check_num_args(args, 1)) |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4568 return NULL; |
|
31176
381140e7e9d7
Improve argument checking speed.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
4569 obj = PyTuple_GET_ITEM(args, 0); |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4570 ret = (*func)(self, obj, NULL); |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4571 if (ret < 0) |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4572 return NULL; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4573 Py_INCREF(Py_None); |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4574 return Py_None; |
|
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
4575 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4576 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4577 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
|
4578 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
|
4579 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4580 initproc func = (initproc)wrapped; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4581 |
|
20599
ff57a1a370b3
Methods of built-in types now properly check for keyword arguments
Guido van Rossum <guido@python.org>
parents:
20595
diff
changeset
|
4582 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
|
4583 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4584 Py_INCREF(Py_None); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4585 return Py_None; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4586 } |
|
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 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
|
4589 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
|
4590 { |
|
19429
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4591 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
|
4592 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
|
4593 |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4594 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
|
4595 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
|
4596 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
|
4597 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
|
4598 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
|
4599 "%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
|
4600 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
|
4601 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
|
4602 } |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4603 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
|
4604 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
|
4605 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
|
4606 "%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
|
4607 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
|
4608 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
|
4609 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
|
4610 } |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4611 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
|
4612 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
|
4613 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
|
4614 "%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
|
4615 type->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4616 subtype->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4617 subtype->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4618 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
|
4619 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
|
4620 } |
|
19429
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4621 |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4622 /* 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
|
4623 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
|
4624 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
|
4625 staticbase = subtype; |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4626 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
|
4627 staticbase = staticbase->tp_base; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4628 /* If staticbase is NULL now, it is a really weird type. |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4629 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
|
4630 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
|
4631 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
|
4632 "%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
|
4633 type->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4634 subtype->tp_name, |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4635 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
|
4636 return NULL; |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4637 } |
|
9cf669581110
Merge changes from r22a2-branch back into trunk. Also, change patch
Barry Warsaw <barry@python.org>
parents:
19353
diff
changeset
|
4638 |
|
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
|
4639 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
|
4640 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
|
4641 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
|
4642 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
|
4643 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
|
4644 return res; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4645 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4646 |
|
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
|
4647 static struct PyMethodDef tp_new_methoddef[] = { |
|
41816
ec83d21065aa
Stop using METH_OLDARGS implicitly
Neal Norwitz <nnorwitz@gmail.com>
parents:
41576
diff
changeset
|
4648 {"__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
|
4649 PyDoc_STR("T.__new__(S, ...) -> " |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4650 "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
|
4651 {0} |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4652 }; |
|
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 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
|
4655 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
|
4656 { |
| 19036 | 4657 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
|
4658 |
|
20445
27ab0327b2fc
Get rid of __defined__ and tp_defined -- there's no need to
Guido van Rossum <guido@python.org>
parents:
20439
diff
changeset
|
4659 if (PyDict_GetItemString(type->tp_dict, "__new__") != NULL) |
| 19036 | 4660 return 0; |
| 4661 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
|
4662 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
|
4663 return -1; |
| 32407 | 4664 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
|
4665 Py_DECREF(func); |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4666 return -1; |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4667 } |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4668 Py_DECREF(func); |
|
75e5d1e8b617
Fix leak found by Eric Huss.
Raymond Hettinger <python@rcn.com>
parents:
32323
diff
changeset
|
4669 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
|
4670 } |
|
c1daa94c21d8
A totally new way to do the __new__ wrapper. This should address the
Guido van Rossum <guido@python.org>
parents:
18941
diff
changeset
|
4671 |
| 19036 | 4672 /* Slot wrappers that call the corresponding __foo__ slot. See comments |
| 4673 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
|
4674 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4675 #define SLOT0(FUNCNAME, OPSTR) \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4676 static PyObject * \ |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4677 FUNCNAME(PyObject *self) \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4678 { \ |
|
19540
e141b392b61d
Fix a typo in SLOT0 macro for the declaration of cache_str.
Guido van Rossum <guido@python.org>
parents:
19538
diff
changeset
|
4679 static PyObject *cache_str; \ |
| 19911 | 4680 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
|
4681 } |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4682 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4683 #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
|
4684 static PyObject * \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4685 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
|
4686 { \ |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4687 static PyObject *cache_str; \ |
| 19911 | 4688 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
|
4689 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4690 |
|
27124
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4691 /* 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
|
4692 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
|
4693 static int |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4694 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
|
4695 { |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4696 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
|
4697 int ok; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4698 |
|
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
|
4699 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
|
4700 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
|
4701 PyErr_Clear(); |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4702 /* 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
|
4703 return 0; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4704 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4705 |
|
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
|
4706 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
|
4707 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
|
4708 PyErr_Clear(); |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4709 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
|
4710 /* 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
|
4711 return 1; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4712 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4713 |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4714 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
|
4715 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
|
4716 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
|
4717 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
|
4718 PyErr_Clear(); |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4719 return 0; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4720 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4721 |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4722 return ok; |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4723 } |
|
d1850a36ae41
Add a refinement to SLOT1BINFULL() that fixes the problem reported in
Guido van Rossum <guido@python.org>
parents:
26964
diff
changeset
|
4724 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4725 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4726 #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
|
4727 static PyObject * \ |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4728 FUNCNAME(PyObject *self, PyObject *other) \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4729 { \ |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4730 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
|
4731 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
|
4732 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
|
4733 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
|
4734 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
|
4735 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
|
4736 PyObject *r; \ |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4737 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
|
4738 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
|
4739 method_is_overloaded(self, other, ROPSTR)) { \ |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4740 r = call_maybe( \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4741 other, ROPSTR, &rcache_str, "(O)", self); \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4742 if (r != Py_NotImplemented) \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4743 return r; \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4744 Py_DECREF(r); \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4745 do_other = 0; \ |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4746 } \ |
|
19913
ca0f54dacdd8
Add call_maybe(): a variant of call_method() that returns
Guido van Rossum <guido@python.org>
parents:
19911
diff
changeset
|
4747 r = call_maybe( \ |
| 19911 | 4748 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
|
4749 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
|
4750 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
|
4751 return r; \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4752 Py_DECREF(r); \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4753 } \ |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4754 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
|
4755 return call_maybe( \ |
| 19911 | 4756 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
|
4757 } \ |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4758 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
|
4759 return Py_NotImplemented; \ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4760 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4761 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4762 #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
|
4763 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
|
4764 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4765 #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
|
4766 static PyObject * \ |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4767 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
|
4768 { \ |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4769 static PyObject *cache_str; \ |
| 19911 | 4770 return call_method(self, OPSTR, &cache_str, \ |
| 4771 "(" ARGCODES ")", arg1, arg2); \ | |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4772 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4773 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4774 static Py_ssize_t |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4775 slot_sq_length(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4776 { |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4777 static PyObject *len_str; |
| 19911 | 4778 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
|
4779 Py_ssize_t len; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4780 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4781 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4782 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
|
4783 len = PyInt_AsSsize_t(res); |
|
20197
b4f0f10a6c5f
slot_sq_length(): squash a leak.
Guido van Rossum <guido@python.org>
parents:
20195
diff
changeset
|
4784 Py_DECREF(res); |
|
24376
aa9e054270a2
Complain if __len__() returns < 0, just like classic classes.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24280
diff
changeset
|
4785 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
|
4786 if (!PyErr_Occurred()) |
|
6ba402b60041
Forward-port of r52136,52138: a review of overflow-detecting code.
Armin Rigo <arigo@tunes.org>
parents:
39921
diff
changeset
|
4787 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
|
4788 "__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
|
4789 return -1; |
|
aa9e054270a2
Complain if __len__() returns < 0, just like classic classes.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24280
diff
changeset
|
4790 } |
|
20197
b4f0f10a6c5f
slot_sq_length(): squash a leak.
Guido van Rossum <guido@python.org>
parents:
20195
diff
changeset
|
4791 return len; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4792 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4793 |
|
20229
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4794 /* 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
|
4795 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
|
4796 static PyObject * |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4797 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
|
4798 { |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4799 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
|
4800 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
|
4801 descrgetfunc f; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4802 |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4803 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
|
4804 getitem_str = PyString_InternFromString("__getitem__"); |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4805 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
|
4806 return NULL; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4807 } |
|
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
|
4808 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
|
4809 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
|
4810 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
|
4811 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
|
4812 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
|
4813 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
|
4814 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
|
4815 return NULL; |
|
680bfcc9ca06
Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman
Neal Norwitz <nnorwitz@gmail.com>
parents:
25839
diff
changeset
|
4816 } |
|
680bfcc9ca06
Fix SF # 624982, Potential AV in slot_sq_item, by Greg Chapman
Neal Norwitz <nnorwitz@gmail.com>
parents:
25839
diff
changeset
|
4817 } |
|
36519
d6d415df0df0
Use Py_ssize_t for counts and sizes.
Martin v. Löwis <martin@v.loewis.de>
parents:
36510
diff
changeset
|
4818 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
|
4819 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
|
4820 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
|
4821 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
|
4822 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
|
4823 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
|
4824 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
|
4825 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
|
4826 return retval; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4827 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4828 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4829 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4830 else { |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4831 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
|
4832 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4833 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
|
4834 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
|
4835 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
|
4836 return NULL; |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4837 } |
|
8bad55edfdf3
*EXPERIMENTAL* speedup of slot_sq_item. This sped up the following
Guido van Rossum <guido@python.org>
parents:
20225
diff
changeset
|
4838 |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4839 SLOT2(slot_sq_slice, "__getslice__", Py_ssize_t, Py_ssize_t, "nn") |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4840 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4841 static int |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4842 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
|
4843 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4844 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
|
4845 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
|
4846 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4847 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
|
4848 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
|
4849 "(n)", index); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4850 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4851 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
|
4852 "(nO)", index, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4853 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4854 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4855 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4856 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4857 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4858 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4859 static int |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
4860 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
|
4861 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4862 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
|
4863 static PyObject *delslice_str, *setslice_str; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4864 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4865 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
|
4866 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
|
4867 "(nn)", i, j); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4868 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4869 res = call_method(self, "__setslice__", &setslice_str, |
|
37880
96aa5ce86445
Fix variable/format-char discrepancy in new-style class __getitem__,
Thomas Wouters <thomas@python.org>
parents:
37815
diff
changeset
|
4870 "(nnO)", i, j, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4871 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4872 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4873 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4874 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4875 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4876 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4877 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4878 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
|
4879 { |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
4880 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
|
4881 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
|
4882 |
|
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
|
4883 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
|
4884 |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4885 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
|
4886 if (func != NULL) { |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
4887 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
|
4888 if (args == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
4889 res = NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
4890 else { |
| 19911 | 4891 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
|
4892 Py_DECREF(args); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
4893 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
4894 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
|
4895 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
|
4896 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
|
4897 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
|
4898 } |
|
33319458fe99
slot_sq_contains(): This leaked a reference to the result of calling
Tim Peters <tim.peters@gmail.com>
parents:
28389
diff
changeset
|
4899 } |
|
33319458fe99
slot_sq_contains(): This leaked a reference to the result of calling
Tim Peters <tim.peters@gmail.com>
parents:
28389
diff
changeset
|
4900 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
|
4901 /* 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
|
4902 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
|
4903 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
|
4904 } |
|
33319458fe99
slot_sq_contains(): This leaked a reference to the result of calling
Tim Peters <tim.peters@gmail.com>
parents:
28389
diff
changeset
|
4905 return result; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4906 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4907 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4908 #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
|
4909 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4910 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
|
4911 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4912 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4913 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
|
4914 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4915 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
|
4916 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
|
4917 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4918 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
|
4919 res = call_method(self, "__delitem__", &delitem_str, |
| 19911 | 4920 "(O)", key); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4921 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4922 res = call_method(self, "__setitem__", &setitem_str, |
| 19911 | 4923 "(OO)", key, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4924 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4925 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4926 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4927 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4928 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4929 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4930 SLOT1BIN(slot_nb_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
|
4931 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
|
4932 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
|
4933 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
|
4934 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
|
4935 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
|
4936 |
|
24280
1598a1e473e2
staticforward bites the dust.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
24250
diff
changeset
|
4937 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
|
4938 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4939 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
|
4940 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
|
4941 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4942 static PyObject * |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4943 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
|
4944 { |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
4945 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
|
4946 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4947 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
|
4948 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
|
4949 /* 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
|
4950 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
|
4951 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
|
4952 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
|
4953 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
|
4954 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
|
4955 "(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
|
4956 } |
|
41097e92f560
Three's a charm: yet another fix for SF bug 551412. Thinking again
Guido van Rossum <guido@python.org>
parents:
23666
diff
changeset
|
4957 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
|
4958 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
|
4959 } |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4960 |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
4961 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
|
4962 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
|
4963 SLOT0(slot_nb_absolute, "__abs__") |
|
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 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4966 slot_nb_nonzero(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4967 { |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
4968 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
|
4969 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
|
4970 int result = -1; |
|
19535
9753608e2d57
Change in policy: when a slot_tp_xxx function looks for the __xxx__ method,
Guido van Rossum <guido@python.org>
parents:
19476
diff
changeset
|
4971 |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4972 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
|
4973 if (func == NULL) { |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4974 if (PyErr_Occurred()) |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4975 return -1; |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4976 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
|
4977 if (func == NULL) |
|
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
4978 return PyErr_Occurred() ? -1 : 1; |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
4979 } |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
4980 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
|
4981 if (args != NULL) { |
|
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
4982 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
|
4983 Py_DECREF(args); |
|
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
4984 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
|
4985 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
|
4986 result = PyObject_IsTrue(temp); |
|
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
4987 else { |
|
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
4988 PyErr_Format(PyExc_TypeError, |
|
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
4989 "__nonzero__ should return " |
|
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
4990 "bool or int, returned %s", |
|
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
4991 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
|
4992 result = -1; |
|
29607
60b53db14aa3
Check return type of __nonzero__() method.
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
29442
diff
changeset
|
4993 } |
|
26575
93b5ca9423eb
slot_nb_nonzero(): Another leak uncovered by the sandbox datetime
Tim Peters <tim.peters@gmail.com>
parents:
26559
diff
changeset
|
4994 Py_DECREF(temp); |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4995 } |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
4996 } |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
4997 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
|
4998 return result; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
4999 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5000 |
|
36882
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5001 |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
5002 static PyObject * |
|
36882
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5003 slot_nb_index(PyObject *self) |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5004 { |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5005 static PyObject *index_str; |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
5006 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
|
5007 } |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5008 |
|
6a9c7165b17b
Checking in the code for PEP 357.
Guido van Rossum <guido@python.org>
parents:
36866
diff
changeset
|
5009 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5010 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
|
5011 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
|
5012 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
|
5013 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
|
5014 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
|
5015 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
|
5016 |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5017 static int |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5018 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
|
5019 { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5020 static PyObject *coerce_str; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5021 PyObject *self = *a, *other = *b; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5022 |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5023 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
|
5024 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
|
5025 PyObject *r; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5026 r = call_maybe( |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5027 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
|
5028 if (r == NULL) |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5029 return -1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5030 if (r == Py_NotImplemented) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5031 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5032 } |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5033 else { |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5034 if (!PyTuple_Check(r) || PyTuple_GET_SIZE(r) != 2) { |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5035 PyErr_SetString(PyExc_TypeError, |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5036 "__coerce__ didn't return a 2-tuple"); |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5037 Py_DECREF(r); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5038 return -1; |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5039 } |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5040 *a = PyTuple_GET_ITEM(r, 0); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5041 Py_INCREF(*a); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5042 *b = PyTuple_GET_ITEM(r, 1); |
|
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5043 Py_INCREF(*b); |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5044 Py_DECREF(r); |
|
20204
8e6f604b0799
Miscellaneous code fiddling:
Guido van Rossum <guido@python.org>
parents:
20197
diff
changeset
|
5045 return 0; |
|
20140
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5046 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5047 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5048 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
|
5049 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
|
5050 PyObject *r; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5051 r = call_maybe( |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5052 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
|
5053 if (r == NULL) |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5054 return -1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5055 if (r == Py_NotImplemented) { |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5056 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5057 return 1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5058 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5059 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
|
5060 PyErr_SetString(PyExc_TypeError, |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5061 "__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
|
5062 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5063 return -1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5064 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5065 *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
|
5066 Py_INCREF(*a); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5067 *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
|
5068 Py_INCREF(*b); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5069 Py_DECREF(r); |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5070 return 0; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5071 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5072 return 1; |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5073 } |
|
225f17ec8932
Merge branch changes (coercion, rich comparisons) into trunk.
Guido van Rossum <guido@python.org>
parents:
20095
diff
changeset
|
5074 |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5075 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
|
5076 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
|
5077 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
|
5078 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
|
5079 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
|
5080 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
|
5081 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
|
5082 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
|
5083 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
|
5084 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
|
5085 /* 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
|
5086 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
|
5087 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
|
5088 { |
|
f6f391d1d050
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Martin v. Löwis <martin@v.loewis.de>
parents:
40707
diff
changeset
|
5089 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
|
5090 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
|
5091 } |
|
19082
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5092 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
|
5093 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
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 "__floordiv__", "__rfloordiv__") |
|
88d124c74766
Proper support for binary operators, including true division and floor
Guido van Rossum <guido@python.org>
parents:
19070
diff
changeset
|
5099 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
|
5100 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
|
5101 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
|
5102 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5103 static int |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5104 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
|
5105 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5106 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
|
5107 static PyObject *cmp_str; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5108 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
|
5109 |
|
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
|
5110 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
|
5111 if (func == NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5112 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5113 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5114 else { |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
5115 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
|
5116 if (args == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5117 res = NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5118 else { |
| 19911 | 5119 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
|
5120 Py_DECREF(args); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5121 } |
|
23967
1a8096bb4c48
Fix SF bug 572567: Memory leak in object comparison.
Raymond Hettinger <python@rcn.com>
parents:
23950
diff
changeset
|
5122 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
|
5123 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
|
5124 if (res == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5125 return -2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5126 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
|
5127 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5128 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
|
5129 return -2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5130 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
|
5131 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5132 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5133 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5134 return 2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5135 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5136 |
|
19970
f761cab28c1c
Hopefully fix 3-way comparisons. This unfortunately adds yet another
Guido van Rossum <guido@python.org>
parents:
19964
diff
changeset
|
5137 /* 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
|
5138 int |
|
f761cab28c1c
Hopefully fix 3-way comparisons. This unfortunately adds yet another
Guido van Rossum <guido@python.org>
parents:
19964
diff
changeset
|
5139 _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
|
5140 { |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5141 int c; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5142 |
|
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
|
5143 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
|
5144 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
|
5145 if (c <= 1) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5146 return c; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5147 } |
|
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
|
5148 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
|
5149 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
|
5150 if (c < -1) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5151 return -2; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5152 if (c <= 1) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5153 return -c; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5154 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5155 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
|
5156 (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
|
5157 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5158 |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5159 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5160 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
|
5161 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5162 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
|
5163 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
|
5164 |
|
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
|
5165 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
|
5166 if (func != NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5167 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
|
5168 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5169 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5170 } |
|
19476
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
5171 PyErr_Clear(); |
|
0e70df98424e
repr's converted to using PyString_FromFormat() instead of sprintf'ing
Barry Warsaw <barry@python.org>
parents:
19469
diff
changeset
|
5172 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
|
5173 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
|
5174 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5175 |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5176 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5177 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
|
5178 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5179 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
|
5180 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
|
5181 |
|
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
|
5182 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
|
5183 if (func != NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5184 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
|
5185 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5186 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5187 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5188 else { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5189 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5190 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
|
5191 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5192 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5193 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5194 static long |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5195 slot_tp_hash(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5196 { |
|
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
|
5197 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
|
5198 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
|
5199 long h; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5200 |
|
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
|
5201 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
|
5202 |
|
44357
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5203 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
|
5204 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
|
5205 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5206 if (res == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5207 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
|
5208 if (PyLong_Check(res)) |
|
39415
9a8081cf4a70
Fix and test for an infinite C recursion.
Armin Rigo <arigo@tunes.org>
parents:
39410
diff
changeset
|
5209 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
|
5210 else |
|
5b9692f6629f
__hash__ may now return long int; the final hash
Martin v. Löwis <martin@v.loewis.de>
parents:
39367
diff
changeset
|
5211 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
|
5212 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
|
5213 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5214 else { |
|
44365
8dead6f81bae
Fix refleak introduced in r59576.
Georg Brandl <georg@python.org>
parents:
44357
diff
changeset
|
5215 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
|
5216 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
|
5217 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
|
5218 if (func == NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5219 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
|
5220 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
|
5221 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5222 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
|
5223 PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'", |
|
a3c61c648fc8
Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c.
Georg Brandl <georg@python.org>
parents:
38314
diff
changeset
|
5224 self->ob_type->tp_name); |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5225 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5226 return -1; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5227 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5228 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5229 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
|
5230 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5231 if (h == -1 && !PyErr_Occurred()) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5232 h = -2; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5233 return h; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5234 } |
|
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 PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5237 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
|
5238 { |
|
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
|
5239 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
|
5240 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
|
5241 PyObject *res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5242 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5243 if (meth == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5244 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
|
5245 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5246 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
|
5247 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5248 Py_DECREF(meth); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5249 return res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5250 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5251 |
|
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
|
5252 /* 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
|
5253 |
|
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
|
5254 - 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
|
5255 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
|
5256 |
|
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
|
5257 - 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
|
5258 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5259 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
|
5260 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
|
5261 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
|
5262 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5263 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5264 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
|
5265 { |
|
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
|
5266 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
|
5267 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
|
5268 "(O)", name); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5269 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5270 |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5271 static PyObject * |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5272 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
|
5273 { |
|
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
|
5274 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
|
5275 PyObject *getattr, *getattribute, *res; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5276 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
|
5277 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
|
5278 |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5279 if (getattr_str == NULL) { |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5280 getattr_str = PyString_InternFromString("__getattr__"); |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5281 if (getattr_str == NULL) |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5282 return NULL; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5283 } |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5284 if (getattribute_str == NULL) { |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5285 getattribute_str = |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5286 PyString_InternFromString("__getattribute__"); |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5287 if (getattribute_str == NULL) |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5288 return NULL; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5289 } |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5290 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
|
5291 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
|
5292 /* 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
|
5293 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
|
5294 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
|
5295 } |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5296 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
|
5297 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
|
5298 (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
|
5299 ((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
|
5300 (void *)PyObject_GenericGetAttr)) |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5301 res = PyObject_GenericGetAttr(self, name); |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5302 else |
|
38314
1fdf29a88f0e
Replace PyObject_CallFunction calls with only object args
Georg Brandl <georg@python.org>
parents:
37880
diff
changeset
|
5303 res = PyObject_CallFunctionObjArgs(getattribute, self, name, NULL); |
|
20499
a0c8c2e5a44d
Remove a bunch of stuff that's no longer needed now that update_slot()
Guido van Rossum <guido@python.org>
parents:
20489
diff
changeset
|
5304 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
|
5305 PyErr_Clear(); |
|
38314
1fdf29a88f0e
Replace PyObject_CallFunction calls with only object args
Georg Brandl <georg@python.org>
parents:
37880
diff
changeset
|
5306 res = PyObject_CallFunctionObjArgs(getattr, self, name, NULL); |
|
20028
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5307 } |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5308 return res; |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5309 } |
|
df1b83fd0ebb
Add the __getattr__ hook back. The rules are now:
Guido van Rossum <guido@python.org>
parents:
20021
diff
changeset
|
5310 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5311 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5312 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
|
5313 { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5314 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
|
5315 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
|
5316 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5317 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
|
5318 res = call_method(self, "__delattr__", &delattr_str, |
| 19911 | 5319 "(O)", name); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5320 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5321 res = call_method(self, "__setattr__", &setattr_str, |
| 19911 | 5322 "(OO)", name, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5323 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5324 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5325 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5326 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5327 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5328 |
|
44357
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5329 static char *name_op[] = { |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5330 "__lt__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5331 "__le__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5332 "__eq__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5333 "__ne__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5334 "__gt__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5335 "__ge__", |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5336 }; |
|
174e0bcb2c3c
Patch #1549 by Thomas Herve.
Guido van Rossum <guido@python.org>
parents:
44350
diff
changeset
|
5337 |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5338 static PyObject * |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5339 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
|
5340 { |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5341 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
|
5342 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
|
5343 |
|
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
|
5344 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
|
5345 if (func == NULL) { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5346 PyErr_Clear(); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5347 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
|
5348 return Py_NotImplemented; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5349 } |
|
30683
3b59fa5d25b1
Simplify and speedup uses of Py_BuildValue():
Raymond Hettinger <python@rcn.com>
parents:
30671
diff
changeset
|
5350 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
|
5351 if (args == NULL) |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5352 res = NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5353 else { |
| 19911 | 5354 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
|
5355 Py_DECREF(args); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5356 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5357 Py_DECREF(func); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5358 return res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5359 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5360 |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5361 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5362 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
|
5363 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5364 PyObject *res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5365 |
|
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
|
5366 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
|
5367 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
|
5368 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
|
5369 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5370 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5371 } |
|
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
|
5372 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
|
5373 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
|
5374 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
|
5375 return res; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5376 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5377 Py_DECREF(res); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5378 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5379 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
|
5380 return Py_NotImplemented; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5381 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5382 |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5383 static PyObject * |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5384 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
|
5385 { |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5386 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
|
5387 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
|
5388 |
|
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
|
5389 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
|
5390 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
|
5391 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
|
5392 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
|
5393 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
|
5394 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
|
5395 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
|
5396 } |
|
255d1d3e66a3
Squash a few calls to the hideously expensive PyObject_CallObject(o,a)
Guido van Rossum <guido@python.org>
parents:
24862
diff
changeset
|
5397 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
|
5398 return res; |
|
19289
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5399 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5400 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
|
5401 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
|
5402 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
|
5403 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
|
5404 "'%.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
|
5405 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
|
5406 return NULL; |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5407 } |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5408 Py_DECREF(func); |
|
5c2bf6cde123
- Another big step in the right direction. All the overridable
Guido van Rossum <guido@python.org>
parents:
19253
diff
changeset
|
5409 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
|
5410 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5411 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5412 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5413 slot_tp_iternext(PyObject *self) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5414 { |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5415 static PyObject *next_str; |
| 19911 | 5416 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
|
5417 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5418 |
|
19339
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5419 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
|
5420 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
|
5421 { |
|
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
|
5422 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
|
5423 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
|
5424 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
|
5425 |
|
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5426 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
|
5427 get_str = PyString_InternFromString("__get__"); |
|
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5428 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
|
5429 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
|
5430 } |
|
6130deeb4cc6
type_new(): look for __dynamic__ at the module level (after looking in
Guido van Rossum <guido@python.org>
parents:
19329
diff
changeset
|
5431 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
|
5432 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
|
5433 /* 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
|
5434 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
|
5435 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
|
5436 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
|
5437 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
|
5438 } |
|
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
|
5439 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
|
5440 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
|
5441 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
|
5442 type = Py_None; |
|
38314
1fdf29a88f0e
Replace PyObject_CallFunction calls with only object args
Georg Brandl <georg@python.org>
parents:
37880
diff
changeset
|
5443 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
|
5444 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5445 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5446 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5447 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
|
5448 { |
|
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
|
5449 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
|
5450 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
|
5451 |
|
45d0e114212e
slot_tp_descr_get(): guard against NULL obj or type (bug reported by
Guido van Rossum <guido@python.org>
parents:
19429
diff
changeset
|
5452 if (value == NULL) |
|
21142
842b280421ba
Fix for SF bug #485678.
Guido van Rossum <guido@python.org>
parents:
20978
diff
changeset
|
5453 res = call_method(self, "__delete__", &del_str, |
| 19911 | 5454 "(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
|
5455 else |
|
19538
b4a3fc147929
Finish the previous checkin: also avoid getattr when calling the method
Guido van Rossum <guido@python.org>
parents:
19535
diff
changeset
|
5456 res = call_method(self, "__set__", &set_str, |
| 19911 | 5457 "(OO)", target, value); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5458 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5459 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5460 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5461 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5462 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5463 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5464 static int |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5465 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
|
5466 { |
|
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
|
5467 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
|
5468 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
|
5469 PyObject *res; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5470 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5471 if (meth == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5472 return -1; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5473 res = PyObject_Call(meth, args, kwds); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5474 Py_DECREF(meth); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5475 if (res == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5476 return -1; |
|
34668
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5477 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
|
5478 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
|
5479 "__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
|
5480 Py_TYPE(res)->tp_name); |
|
34668
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5481 Py_DECREF(res); |
|
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5482 return -1; |
|
9b3a2c4302aa
SF bug #1155938: Missing None check for __init__().
Raymond Hettinger <python@rcn.com>
parents:
33541
diff
changeset
|
5483 } |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5484 Py_DECREF(res); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5485 return 0; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5486 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5487 |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5488 static PyObject * |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5489 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
|
5490 { |
|
24680
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5491 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
|
5492 PyObject *func; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5493 PyObject *newargs, *x; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5494 Py_ssize_t i, n; |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5495 |
|
24680
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5496 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
|
5497 new_str = PyString_InternFromString("__new__"); |
|
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5498 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
|
5499 return NULL; |
|
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5500 } |
|
6d26d4b9c5a3
Significant speedup in new-style object creation: in slot_tp_new(),
Guido van Rossum <guido@python.org>
parents:
24678
diff
changeset
|
5501 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
|
5502 if (func == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5503 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5504 assert(PyTuple_Check(args)); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5505 n = PyTuple_GET_SIZE(args); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5506 newargs = PyTuple_New(n+1); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5507 if (newargs == NULL) |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5508 return NULL; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5509 Py_INCREF(type); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5510 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
|
5511 for (i = 0; i < n; i++) { |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5512 x = PyTuple_GET_ITEM(args, i); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5513 Py_INCREF(x); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5514 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
|
5515 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5516 x = PyObject_Call(func, newargs, kwds); |
|
20195
3408d929bb94
slot_tp_new(): newargs was leaking.
Guido van Rossum <guido@python.org>
parents:
20190
diff
changeset
|
5517 Py_DECREF(newargs); |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5518 Py_DECREF(func); |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5519 return x; |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5520 } |
|
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
5521 |
|
24678
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5522 static void |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5523 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
|
5524 { |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5525 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
|
5526 PyObject *del, *res; |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5527 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
|
5528 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5529 /* 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
|
5530 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
|
5531 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
|
5532 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5533 /* 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
|
5534 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
|
5535 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5536 /* 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
|
5537 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
|
5538 if (del != NULL) { |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5539 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
|
5540 if (res == NULL) |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5541 PyErr_WriteUnraisable(del); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5542 else |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5543 Py_DECREF(res); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5544 Py_DECREF(del); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5545 } |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5546 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5547 /* 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
|
5548 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
|
5549 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5550 /* 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
|
5551 * 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
|
5552 */ |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5553 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
|
5554 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
|
5555 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
|
5556 |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5557 /* __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
|
5558 * never happened. |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5559 */ |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5560 { |
|
36866
9eb24f92a784
Change int to Py_ssize_t in several places.
Martin v. Löwis <martin@v.loewis.de>
parents:
36675
diff
changeset
|
5561 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
|
5562 _Py_NewReference(self); |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5563 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
|
5564 } |
|
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
|
5565 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
|
5566 _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
|
5567 /* 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
|
5568 * 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
|
5569 _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
|
5570 /* 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
|
5571 * 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
|
5572 * 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
|
5573 * _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
|
5574 * undone. |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5575 */ |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5576 #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
|
5577 --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
|
5578 --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
|
5579 #endif |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5580 } |
|
71dca7c76fa2
A modest speedup of object deallocation. call_finalizer() did rather
Guido van Rossum <guido@python.org>
parents:
24653
diff
changeset
|
5581 |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5582 |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5583 /* 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
|
5584 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
|
5585 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
|
5586 sequences and mappings. |
|
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
5587 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
|
5588 __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
|
5589 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
|
5590 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
|
5591 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
|
5592 |
|
20586
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5593 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
|
5594 |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5595 #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
|
5596 #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
|
5597 #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
|
5598 #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
|
5599 #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
|
5600 #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
|
5601 #undef UNSLOT |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5602 #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
|
5603 #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
|
5604 #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
|
5605 |
|
20586
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5606 #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
|
5607 {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
|
5608 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
|
5609 #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
|
5610 {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
|
5611 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
|
5612 #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
|
5613 {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
|
5614 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
|
5615 #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
|
5616 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
|
5617 #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
|
5618 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
|
5619 #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
|
5620 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
|
5621 #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
|
5622 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
|
5623 "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
|
5624 #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
|
5625 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
|
5626 "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
|
5627 #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
|
5628 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
|
5629 "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
|
5630 #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
|
5631 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
|
5632 "x." NAME "(y) <==> y" DOC "x") |
|
35004
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5633 #define BINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5634 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_l, \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5635 "x." NAME "(y) <==> " DOC) |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5636 #define RBINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5637 ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_r, \ |
|
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5638 "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
|
5639 |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5640 static slotdef slotdefs[] = { |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5641 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
|
5642 "x.__len__() <==> len(x)"), |
| 36150 | 5643 /* Heap types defining __add__/__mul__ have sq_concat/sq_repeat == NULL. |
| 5644 The logic in abstract.c always falls back to nb_add/nb_multiply in | |
| 5645 this case. Defining both the nb_* and the sq_* slots to call the | |
| 5646 user-defined methods has unexpected side-effects, as shown by | |
| 5647 test_descr.notimplemented() */ | |
| 5648 SQSLOT("__add__", sq_concat, NULL, wrap_binaryfunc, | |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5649 "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
|
5650 SQSLOT("__mul__", sq_repeat, NULL, wrap_indexargfunc, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5651 "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
|
5652 SQSLOT("__rmul__", sq_repeat, NULL, wrap_indexargfunc, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5653 "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
|
5654 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
|
5655 "x.__getitem__(y) <==> x[y]"), |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5656 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
|
5657 "x.__getslice__(i, j) <==> x[i:j]\n\ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5658 \n\ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5659 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
|
5660 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
|
5661 "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
|
5662 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
|
5663 "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
|
5664 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
|
5665 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
|
5666 "x.__setslice__(i, j, y) <==> x[i:j]=y\n\ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5667 \n\ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5668 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
|
5669 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
|
5670 "x.__delslice__(i, j) <==> del x[i:j]\n\ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5671 \n\ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5672 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
|
5673 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
|
5674 "x.__contains__(y) <==> y in x"), |
| 36150 | 5675 SQSLOT("__iadd__", sq_inplace_concat, NULL, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5676 wrap_binaryfunc, "x.__iadd__(y) <==> x+=y"), |
| 36150 | 5677 SQSLOT("__imul__", sq_inplace_repeat, NULL, |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
5678 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
|
5679 |
|
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5680 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
|
5681 "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
|
5682 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
|
5683 wrap_binaryfunc, |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5684 "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
|
5685 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
|
5686 wrap_objobjargproc, |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5687 "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
|
5688 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
|
5689 wrap_delitem, |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5690 "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
|
5691 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5692 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
|
5693 "+"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5694 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
|
5695 "+"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5696 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
|
5697 "-"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5698 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
|
5699 "-"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5700 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
|
5701 "*"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5702 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
|
5703 "*"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5704 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
|
5705 "/"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5706 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
|
5707 "/"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5708 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
|
5709 "%"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5710 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
|
5711 "%"), |
|
35004
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5712 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
|
5713 "divmod(x, y)"), |
|
35004
8880d91cdb09
fix object.__divmod__.__doc__
Anthony Baxter <anthonybaxter@gmail.com>
parents:
34958
diff
changeset
|
5714 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
|
5715 "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
|
5716 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
|
5717 "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
|
5718 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
|
5719 "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
|
5720 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
|
5721 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
|
5722 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
|
5723 "abs(x)"), |
|
30670
7f6134f8bd06
SF bug #820397: __nonzero__() returns 1/0
Raymond Hettinger <python@rcn.com>
parents:
30660
diff
changeset
|
5724 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
|
5725 "x != 0"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5726 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
|
5727 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
|
5728 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
|
5729 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
|
5730 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
|
5731 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
|
5732 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
|
5733 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
|
5734 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
|
5735 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
|
5736 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
|
5737 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
|
5738 "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
|
5739 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
|
5740 "int(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5741 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
|
5742 "long(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5743 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
|
5744 "float(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5745 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
|
5746 "oct(x)"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5747 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
|
5748 "hex(x)"), |
|
39463
6cafdc81cfde
Patch #1538606, Patch to fix __index__() clipping.
Neal Norwitz <nnorwitz@gmail.com>
parents:
39415
diff
changeset
|
5749 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
|
5750 "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
|
5751 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
|
5752 wrap_binaryfunc, "+"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5753 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
|
5754 wrap_binaryfunc, "-"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5755 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
|
5756 wrap_binaryfunc, "*"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5757 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
|
5758 wrap_binaryfunc, "/"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5759 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
|
5760 wrap_binaryfunc, "%"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5761 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
|
5762 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
|
5763 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
|
5764 wrap_binaryfunc, "<<"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5765 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
|
5766 wrap_binaryfunc, ">>"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5767 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
|
5768 wrap_binaryfunc, "&"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5769 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
|
5770 wrap_binaryfunc, "^"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5771 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
|
5772 wrap_binaryfunc, "|"), |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5773 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
|
5774 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
|
5775 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
|
5776 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
|
5777 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
|
5778 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
|
5779 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
|
5780 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
|
5781 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
5782 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
|
5783 "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
|
5784 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
|
5785 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
|
5786 "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
|
5787 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
|
5788 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
|
5789 "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
|
5790 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
|
5791 "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
|
5792 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
|
5793 "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
|
5794 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
|
5795 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
|
5796 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
|
5797 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
|
5798 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
|
5799 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
|
5800 "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
|
5801 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
|
5802 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
|
5803 "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
|
5804 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
|
5805 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
|
5806 "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
|
5807 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
|
5808 "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
|
5809 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
|
5810 "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
|
5811 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
|
5812 "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
|
5813 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
|
5814 "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
|
5815 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
|
5816 "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
|
5817 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
|
5818 "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
|
5819 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
|
5820 "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
|
5821 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
|
5822 "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
|
5823 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
|
5824 "descr.__set__(obj, value)"), |
|
24460
2d77be41ee5f
SF patch 588728 (Nathan Srebro).
Guido van Rossum <guido@python.org>
parents:
24427
diff
changeset
|
5825 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
|
5826 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
|
5827 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
|
5828 "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
|
5829 "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
|
5830 PyWrapperFlag_KEYWORDS), |
|
ff57a1a370b3
Methods of built-in types now properly check for keyword arguments
Guido van Rossum <guido@python.org>
parents:
20595
diff
changeset
|
5831 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
|
5832 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
|
5833 {NULL} |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5834 }; |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5835 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5836 /* 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
|
5837 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
|
5838 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
|
5839 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
|
5840 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
|
5841 static void ** |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5842 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
|
5843 { |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5844 char *ptr; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
5845 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
|
5846 |
|
28219
7c8e8807aed2
- The extended type structure used for heap types (new-style
Guido van Rossum <guido@python.org>
parents:
28016
diff
changeset
|
5847 /* 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
|
5848 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
|
5849 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
|
5850 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
|
5851 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
|
5852 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
|
5853 } |
|
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
|
5854 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
|
5855 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
|
5856 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
|
5857 } |
|
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
|
5858 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
|
5859 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
|
5860 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
|
5861 } |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5862 else { |
|
37603
38acb91824fc
Correct casts to char*.
Martin v. Löwis <martin@v.loewis.de>
parents:
37596
diff
changeset
|
5863 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
|
5864 } |
|
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
5865 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
|
5866 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
|
5867 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
|
5868 } |
| 19036 | 5869 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5870 /* 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
|
5871 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
|
5872 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
|
5873 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
|
5874 #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
|
5875 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5876 /* 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
|
5877 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
|
5878 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
|
5879 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
|
5880 { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5881 /* 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
|
5882 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5883 /* 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
|
5884 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
|
5885 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
|
5886 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
|
5887 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
|
5888 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5889 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
|
5890 /* 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
|
5891 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
|
5892 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
|
5893 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
|
5894 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
|
5895 *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
|
5896 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5897 *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
|
5898 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5899 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5900 /* 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
|
5901 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
|
5902 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
|
5903 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
|
5904 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
|
5905 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
|
5906 continue; |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5907 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
|
5908 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
|
5909 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
|
5910 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5911 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
|
5912 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5913 |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
5914 /* 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
|
5915 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
|
5916 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
|
5917 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
|
5918 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
|
5919 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
|
5920 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
|
5921 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
|
5922 { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5923 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
|
5924 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
|
5925 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
|
5926 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
|
5927 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
|
5928 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
|
5929 |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5930 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
|
5931 do { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5932 ++p; |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5933 } 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
|
5934 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
|
5935 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5936 do { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5937 descr = _PyType_Lookup(type, p->name_strobj); |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5938 if (descr == NULL) |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5939 continue; |
|
44350
26384b8180c7
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Christian Heimes <christian@cheimes.de>
parents:
43958
diff
changeset
|
5940 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
|
5941 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
|
5942 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
|
5943 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
|
5944 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
|
5945 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
|
5946 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
|
5947 { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5948 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
|
5949 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
|
5950 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
|
5951 else |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5952 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
|
5953 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5954 } |
|
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
|
5955 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
|
5956 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
|
5957 (PyCFunction)tp_new_wrapper && |
|
36493a7c6253
Major speedup for new-style class creation. Turns out there was some
Guido van Rossum <guido@python.org>
parents:
24680
diff
changeset
|
5958 strcmp(p->name, "__new__") == 0) |
|
36493a7c6253
Major speedup for new-style class creation. Turns out there was some
Guido van Rossum <guido@python.org>
parents:
24680
diff
changeset
|
5959 { |
|
36493a7c6253
Major speedup for new-style class creation. Turns out there was some
Guido van Rossum <guido@python.org>
parents:
24680
diff
changeset
|
5960 /* 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
|
5961 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
|
5962 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
|
5963 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
|
5964 __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
|
5965 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
|
5966 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
|
5967 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
|
5968 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
|
5969 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
|
5970 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
|
5971 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
|
5972 /* 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
|
5973 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
|
5974 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
|
5975 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
|
5976 } |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5977 else { |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5978 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
|
5979 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
|
5980 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5981 } 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
|
5982 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
|
5983 *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
|
5984 else |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5985 *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
|
5986 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
|
5987 } |
|
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
5988 |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
5989 /* 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
|
5990 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
|
5991 static int |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
5992 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
|
5993 { |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
5994 slotdef **pp = (slotdef **)data; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
5995 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
5996 for (; *pp; pp++) |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
5997 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
|
5998 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
|
5999 } |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6000 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6001 /* 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
|
6002 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
|
6003 static int |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6004 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
|
6005 { |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6006 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
|
6007 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
|
6008 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
|
6009 return c; |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6010 else |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6011 /* 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
|
6012 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
|
6013 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
|
6014 } |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6015 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6016 /* 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
|
6017 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
|
6018 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
|
6019 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
|
6020 { |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6021 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
|
6022 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
|
6023 |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6024 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
|
6025 return; |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6026 for (p = slotdefs; p->name; p++) { |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6027 p->name_strobj = PyString_InternFromString(p->name); |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6028 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
|
6029 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
|
6030 } |
|
20457
4f71dcfd0a93
Refactored the update_slot() code a bit to be hopefully slightly more
Guido van Rossum <guido@python.org>
parents:
20445
diff
changeset
|
6031 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
|
6032 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
|
6033 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
|
6034 } |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6035 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6036 /* 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
|
6037 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
|
6038 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
|
6039 { |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6040 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
|
6041 slotdef *p; |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6042 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
|
6043 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
|
6044 |
|
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
|
6045 /* 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
|
6046 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
|
6047 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
|
6048 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
|
6049 recursing into subclasses. */ |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
6050 type_modified(type); |
|
387d48c3a0b3
Re-apply patch #1700288 (first applied in r59931, rolled back in r59940)
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
44661
diff
changeset
|
6051 |
|
20457
4f71dcfd0a93
Refactored the update_slot() code a bit to be hopefully slightly more
Guido van Rossum <guido@python.org>
parents:
20445
diff
changeset
|
6052 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
|
6053 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
|
6054 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
|
6055 /* 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
|
6056 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
|
6057 *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
|
6058 } |
|
4f71dcfd0a93
Refactored the update_slot() code a bit to be hopefully slightly more
Guido van Rossum <guido@python.org>
parents:
20445
diff
changeset
|
6059 *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
|
6060 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
|
6061 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
|
6062 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
|
6063 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
|
6064 --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
|
6065 *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
|
6066 } |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6067 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
|
6068 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
|
6069 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
|
6070 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
|
6071 } |
|
be08734b0afd
Another step in the right direction: when a new class's attribute
Guido van Rossum <guido@python.org>
parents:
20345
diff
changeset
|
6072 |
|
22834
0908729e94e0
A much revised version of SF patch 514662, by Naofumi Honda. This
Guido van Rossum <guido@python.org>
parents:
22804
diff
changeset
|
6073 /* 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
|
6074 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
|
6075 dict. */ |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
6076 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
|
6077 fixup_slot_dispatchers(PyTypeObject *type) |
|
18933
09df3254b49d
Merge of descr-branch back into trunk.
Tim Peters <tim.peters@gmail.com>
parents:
18068
diff
changeset
|
6078 { |
|
20343
7bd12270dc3e
Halfway checkin. This is still messy, but it's beginning to address
Guido van Rossum <guido@python.org>
parents:
20328
diff
changeset
|
6079 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
|
6080 |
|
4698a3ec5fa8
Redid the slot computation. The initial slot assignments are now done
Guido van Rossum <guido@python.org>
parents:
20386
diff
changeset
|
6081 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
|
6082 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
|
6083 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
|
6084 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6085 |
| 26421 | 6086 static void |
| 6087 update_all_slots(PyTypeObject* type) | |
| 6088 { | |
| 6089 slotdef *p; | |
| 6090 | |
| 6091 init_slotdefs(); | |
| 6092 for (p = slotdefs; p->name; p++) { | |
| 6093 /* update_slot returns int but can't actually fail */ | |
| 6094 update_slot(type, p->name_strobj); | |
| 6095 } | |
| 6096 } | |
| 6097 | |
|
28403
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6098 /* 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
|
6099 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
|
6100 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
|
6101 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6102 static int |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6103 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
|
6104 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
|
6105 { |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6106 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
|
6107 return -1; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6108 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
|
6109 } |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6110 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6111 static int |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6112 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
|
6113 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
|
6114 { |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6115 PyTypeObject *subclass; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6116 PyObject *ref, *subclasses, *dict; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6117 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
|
6118 |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6119 subclasses = type->tp_subclasses; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6120 if (subclasses == NULL) |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6121 return 0; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6122 assert(PyList_Check(subclasses)); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6123 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
|
6124 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
|
6125 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
|
6126 assert(PyWeakref_CheckRef(ref)); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6127 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
|
6128 assert(subclass != NULL); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6129 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
|
6130 continue; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6131 assert(PyType_Check(subclass)); |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6132 /* 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
|
6133 dict = subclass->tp_dict; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6134 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
|
6135 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
|
6136 continue; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6137 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
|
6138 return -1; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6139 } |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6140 return 0; |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6141 } |
|
63ed85290413
Refactoring: rename update_these_slots() into update_subclasses() and
Guido van Rossum <guido@python.org>
parents:
28396
diff
changeset
|
6142 |
|
20586
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6143 /* 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
|
6144 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
|
6145 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
|
6146 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
|
6147 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
|
6148 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
|
6149 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
|
6150 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
|
6151 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
|
6152 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6153 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
|
6154 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
|
6155 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
|
6156 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
|
6157 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
|
6158 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
|
6159 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
|
6160 wins. |
|
23830
ade1d56109a8
Hopefully this addresses the remaining issues of SF bugs 459235 and
Guido van Rossum <guido@python.org>
parents:
23756
diff
changeset
|
6161 |
|
ade1d56109a8
Hopefully this addresses the remaining issues of SF bugs 459235 and
Guido van Rossum <guido@python.org>
parents:
23756
diff
changeset
|
6162 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
|
6163 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
|
6164 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
|
6165 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
|
6166 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
|
6167 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
|
6168 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
|
6169 (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
|
6170 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
|
6171 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
|
6172 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6173 static int |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6174 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
|
6175 { |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6176 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
|
6177 slotdef *p; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6178 PyObject *descr; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6179 void **ptr; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6180 |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6181 init_slotdefs(); |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6182 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
|
6183 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
|
6184 continue; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6185 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
|
6186 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
|
6187 continue; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6188 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
|
6189 continue; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6190 descr = PyDescr_NewWrapper(type, p, *ptr); |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6191 if (descr == NULL) |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6192 return -1; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6193 if (PyDict_SetItem(dict, p->name_strobj, descr) < 0) |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6194 return -1; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6195 Py_DECREF(descr); |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6196 } |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6197 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
|
6198 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
|
6199 return -1; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6200 } |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6201 return 0; |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6202 } |
|
9bd603d434f5
Big internal change that should have no external effects: unify the
Guido van Rossum <guido@python.org>
parents:
20516
diff
changeset
|
6203 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6204 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6205 /* Cooperative 'super' */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6206 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6207 typedef struct { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6208 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
|
6209 PyTypeObject *type; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6210 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
|
6211 PyTypeObject *obj_type; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6212 } superobject; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6213 |
|
20012
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
6214 static PyMemberDef super_members[] = { |
|
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
6215 {"__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
|
6216 "the class invoking super()"}, |
|
3faabf54b8b8
Add optional docstrings to member descriptors. For backwards
Guido van Rossum <guido@python.org>
parents:
19970
diff
changeset
|
6217 {"__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
|
6218 "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
|
6219 {"__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
|
6220 "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
|
6221 {0} |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6222 }; |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6223 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6224 static void |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6225 super_dealloc(PyObject *self) |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6226 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6227 superobject *su = (superobject *)self; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6228 |
|
20220
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6229 _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
|
6230 Py_XDECREF(su->obj); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6231 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
|
6232 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
|
6233 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
|
6234 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6235 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6236 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
|
6237 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
|
6238 { |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6239 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
|
6240 |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6241 if (su->obj_type) |
|
19630
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6242 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
|
6243 "<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
|
6244 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
|
6245 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
|
6246 else |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6247 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
|
6248 "<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
|
6249 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
|
6250 } |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6251 |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6252 static PyObject * |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6253 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
|
6254 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6255 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
|
6256 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
|
6257 |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6258 if (!skip) { |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6259 /* 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
|
6260 (i.e. super, or a subclass), not the class of su->obj. */ |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6261 skip = (PyString_Check(name) && |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6262 PyString_GET_SIZE(name) == 9 && |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6263 strcmp(PyString_AS_STRING(name), "__class__") == 0); |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6264 } |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6265 |
|
9be4103807f5
- super() no longer ignores data descriptors, except __class__. See
Guido van Rossum <guido@python.org>
parents:
28625
diff
changeset
|
6266 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
|
6267 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
|
6268 PyTypeObject *starttype; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6269 descrgetfunc f; |
|
36501
7fdc639bc5b4
Merge ssize_t branch.
Martin v. Löwis <martin@v.loewis.de>
parents:
36169
diff
changeset
|
6270 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
|
6271 |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6272 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
|
6273 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
|
6274 |
|
19630
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6275 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
|
6276 n = 0; |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6277 else { |
|
ae056f114974
Give 'super' a decent repr(), and readonly attributes to access the
Guido van Rossum <guido@python.org>
parents:
19618
diff
changeset
|
6278 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
|
6279 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
|
6280 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6281 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
|
6282 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
|
6283 break; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6284 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6285 i++; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6286 res = NULL; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6287 for (; i < n; i++) { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6288 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
|
6289 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
|
6290 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
|
6291 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
|
6292 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
|
6293 else |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
6294 continue; |
|
44f3f5a5bfe2
Changing diapers reminded Guido that he wanted to allow for some measure
Tim Peters <tim.peters@gmail.com>
parents:
20754
diff
changeset
|
6295 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
|
6296 if (res != NULL) { |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6297 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
|
6298 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
|
6299 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
|
6300 tmp = f(res, |
|
37dc8c80ca7e
Ensure super() lookup of descriptor from classmethod works (SF #743627)
Phillip J. Eby <pje@telecommunity.com>
parents:
31477
diff
changeset
|
6301 /* 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
|
6302 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
|
6303 (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
|
6304 */ |
|
31813
8184c677713f
Get rid of gcc warning.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31800
diff
changeset
|
6305 (su->obj == (PyObject *) |
|
8184c677713f
Get rid of gcc warning.
Hye-Shik Chang <hyeshik@gmail.com>
parents:
31800
diff
changeset
|
6306 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
|
6307 ? (PyObject *)NULL |
|
37dc8c80ca7e
Ensure super() lookup of descriptor from classmethod works (SF #743627)
Phillip J. Eby <pje@telecommunity.com>
parents:
31477
diff
changeset
|
6308 : su->obj), |
|
22774
02fddf7c25c2
Fold some long lines. Delete blank initial line.
Guido van Rossum <guido@python.org>
parents:
22770
diff
changeset
|
6309 (PyObject *)starttype); |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6310 Py_DECREF(res); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6311 res = tmp; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6312 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6313 return res; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6314 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6315 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6316 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6317 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
|
6318 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6319 |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6320 static PyTypeObject * |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6321 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
|
6322 { |
|
27831
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6323 /* 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
|
6324 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6325 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
|
6326 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6327 - 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
|
6328 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
|
6329 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6330 - 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
|
6331 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
|
6332 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6333 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
|
6334 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
|
6335 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
|
6336 */ |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6337 |
|
27942
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6338 /* 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
|
6339 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
|
6340 Py_INCREF(obj); |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6341 return (PyTypeObject *)obj; |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6342 } |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6343 |
|
9255fbde43f3
The recent changes to super(), in particular supercheck(), broke when
Guido van Rossum <guido@python.org>
parents:
27866
diff
changeset
|
6344 /* 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
|
6345 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
|
6346 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
|
6347 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
|
6348 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6349 else { |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6350 /* 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
|
6351 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
|
6352 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
|
6353 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6354 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
|
6355 class_str = PyString_FromString("__class__"); |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6356 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
|
6357 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
|
6358 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6359 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6360 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
|
6361 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6362 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
|
6363 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
|
6364 (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
|
6365 { |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6366 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
|
6367 (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
|
6368 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
|
6369 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
|
6370 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6371 |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6372 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
|
6373 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
|
6374 else |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6375 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
|
6376 } |
|
6b5696541ba4
Implement another useful feature for proxies: in super(X, x), x may
Guido van Rossum <guido@python.org>
parents:
27821
diff
changeset
|
6377 |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6378 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
|
6379 "super(type, obj): " |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6380 "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
|
6381 return NULL; |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6382 } |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6383 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6384 static PyObject * |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6385 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
|
6386 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6387 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
|
6388 superobject *newobj; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6389 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6390 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
|
6391 /* 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
|
6392 Py_INCREF(self); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6393 return self; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6394 } |
|
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
|
6395 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
|
6396 /* 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
|
6397 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
|
6398 return PyObject_CallFunctionObjArgs((PyObject *)Py_TYPE(su), |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6399 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
|
6400 else { |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6401 /* 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
|
6402 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
|
6403 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
|
6404 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
|
6405 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
|
6406 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
|
6407 if (newobj == NULL) |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6408 return NULL; |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6409 Py_INCREF(su->type); |
|
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6410 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
|
6411 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
|
6412 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
|
6413 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
|
6414 return (PyObject *)newobj; |
|
21151
918b57354d87
Address SF patch #480716 as well as related issues.
Guido van Rossum <guido@python.org>
parents:
21142
diff
changeset
|
6415 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6416 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6417 |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6418 static int |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6419 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
|
6420 { |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6421 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
|
6422 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
|
6423 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
|
6424 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
|
6425 |
|
39921
49fbddfb1217
Patch #1567691: super() and new.instancemethod() now don't accept
Georg Brandl <georg@python.org>
parents:
39464
diff
changeset
|
6426 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
|
6427 return -1; |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6428 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
|
6429 return -1; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6430 if (obj == Py_None) |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6431 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
|
6432 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
|
6433 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
|
6434 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
|
6435 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
|
6436 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
|
6437 } |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6438 Py_INCREF(type); |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6439 su->type = type; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6440 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
|
6441 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
|
6442 return 0; |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6443 } |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6444 |
|
23832
ed1ba37a46b7
Patch #568124: Add doc string macros.
Martin v. Löwis <martin@v.loewis.de>
parents:
23830
diff
changeset
|
6445 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
|
6446 "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
|
6447 "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
|
6448 "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
|
6449 "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
|
6450 "class C(B):\n" |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6451 " def meth(self, arg):\n" |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6452 " 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
|
6453 |
|
20220
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6454 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
|
6455 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
|
6456 { |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6457 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
|
6458 |
|
7b2e436a4a21
Use Py_VISIT in all tp_traverse methods, instead of traversing manually or
Thomas Wouters <thomas@python.org>
parents:
37748
diff
changeset
|
6459 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
|
6460 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
|
6461 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
|
6462 |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6463 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
|
6464 } |
|
0b99174d6b17
Add Garbage Collection support to new-style classes (not yet to their
Guido van Rossum <guido@python.org>
parents:
20204
diff
changeset
|
6465 |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6466 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
|
6467 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
|
6468 "super", /* tp_name */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6469 sizeof(superobject), /* tp_basicsize */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6470 0, /* tp_itemsize */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6471 /* methods */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6472 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
|
6473 0, /* tp_print */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6474 0, /* tp_getattr */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6475 0, /* tp_setattr */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6476 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
|
6477 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
|
6478 0, /* tp_as_number */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6479 0, /* tp_as_sequence */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6480 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
|
6481 0, /* tp_hash */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6482 0, /* tp_call */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6483 0, /* tp_str */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6484 super_getattro, /* tp_getattro */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6485 0, /* tp_setattro */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6486 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
|
6487 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
|
6488 Py_TPFLAGS_BASETYPE, /* tp_flags */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6489 super_doc, /* tp_doc */ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6490 super_traverse, /* tp_traverse */ |
|
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6491 0, /* tp_clear */ |
|
19469
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6492 0, /* tp_richcompare */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6493 0, /* tp_weaklistoffset */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6494 0, /* tp_iter */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6495 0, /* tp_iternext */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6496 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
|
6497 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
|
6498 0, /* tp_getset */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6499 0, /* tp_base */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6500 0, /* tp_dict */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6501 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
|
6502 0, /* tp_descr_set */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6503 0, /* tp_dictoffset */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6504 super_init, /* tp_init */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6505 PyType_GenericAlloc, /* tp_alloc */ |
|
b3c92f013869
Add 'super', another new object type with magical properties.
Guido van Rossum <guido@python.org>
parents:
19464
diff
changeset
|
6506 PyType_GenericNew, /* tp_new */ |
|
40974
3cabbfa43984
whitespace normalization
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
40908
diff
changeset
|
6507 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
|
6508 }; |