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

annotate Objects/weakrefobject.c @ 87690:66c1c9f32567 default tip

Add use_weakref option to functools.lru_cache The use_weakref option makes lru_cache create weak references to the function arguments when creating the cache key, which prevents them from staying in the memory forever even after all other references to them are gone. This is a proof of concept for http://bugs.python.org/issue19859

author	Radomir Dopieralski <devel@sheep.art.pl>
date	Tue, 03 Dec 2013 16:02:48 +0100
parents	9e7d31b04d78
children

rev	line source
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	1 #include "Python.h"
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	2 #include "structmember.h"
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	3
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	4
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	5 #define GET_WEAKREFS_LISTPTR(o) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	6 ((PyWeakReference **) PyObject_GET_WEAKREFS_LISTPTR(o))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	7
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	8
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	9 Py_ssize_t
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	10 _PyWeakref_GetWeakrefCount(PyWeakReference *head)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	11 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	12 Py_ssize_t count = 0;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	13
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	14 while (head != NULL) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	15 ++count;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	16 head = head->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	17 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	18 return count;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	19 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	20
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	21
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	22 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	23 init_weakref(PyWeakReference self, PyObject ob, PyObject *callback)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	24 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	25 self->hash = -1;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	26 self->wr_object = ob;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	27 Py_XINCREF(callback);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	28 self->wr_callback = callback;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	29 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	30
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	31 static PyWeakReference *
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	32 new_weakref(PyObject ob, PyObject callback)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	33 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	34 PyWeakReference *result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	35
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	36 result = PyObject_GC_New(PyWeakReference, &_PyWeakref_RefType);
ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	37 if (result) {
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	38 init_weakref(result, ob, callback);
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	39 PyObject_GC_Track(result);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	40 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	41 return result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	42 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	43
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	44
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	45 /* This function clears the passed-in reference and removes it from the
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	46 * list of weak references for the referent. This is the only code that
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	47 * removes an item from the doubly-linked list of weak references for an
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	48 * object; it is also responsible for clearing the callback slot.
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	49 */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	50 static void
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	51 clear_weakref(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	52 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	53 PyObject *callback = self->wr_callback;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	54
80759 0748c22b37e5 Issue #16602: When a weakref's target was part of a long deallocation chain, the object could remain reachable through its weakref even though its refcount had dropped to zero. Antoine Pitrou <solipsis@pitrou.net> parents: 80394 diff changeset	55 if (self->wr_object != Py_None) {
0748c22b37e5 Issue #16602: When a weakref's target was part of a long deallocation chain, the object could remain reachable through its weakref even though its refcount had dropped to zero. Antoine Pitrou <solipsis@pitrou.net> parents: 80394 diff changeset	56 PyWeakReference **list = GET_WEAKREFS_LISTPTR(self->wr_object);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	57
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	58 if (*list == self)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	59 /* If 'self' is the end of the list (and thus self->wr_next == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	60 then the weakref list itself (and thus the value of *list) will
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	61 end up being set to NULL. */
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	62 *list = self->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	63 self->wr_object = Py_None;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	64 if (self->wr_prev != NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	65 self->wr_prev->wr_next = self->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	66 if (self->wr_next != NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	67 self->wr_next->wr_prev = self->wr_prev;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	68 self->wr_prev = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	69 self->wr_next = NULL;
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	70 }
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	71 if (callback != NULL) {
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	72 Py_DECREF(callback);
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	73 self->wr_callback = NULL;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	74 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	75 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	76
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	77 /* Cyclic gc uses this to just clear the passed-in reference, leaving
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	78 * the callback intact and uncalled. It must be possible to call self's
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	79 * tp_dealloc() after calling this, so self has to be left in a sane enough
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	80 * state for that to work. We expect tp_dealloc to decref the callback
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	81 * then. The reason for not letting clear_weakref() decref the callback
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	82 * right now is that if the callback goes away, that may in turn trigger
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	83 * another callback (if a weak reference to the callback exists) -- running
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	84 * arbitrary Python code in the middle of gc is a disaster. The convolution
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	85 * here allows gc to delay triggering such callbacks until the world is in
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	86 * a sane state again.
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	87 */
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	88 void
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	89 _PyWeakref_ClearRef(PyWeakReference *self)
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	90 {
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	91 PyObject *callback;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	92
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	93 assert(self != NULL);
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	94 assert(PyWeakref_Check(self));
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	95 /* Preserve and restore the callback around clear_weakref. */
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	96 callback = self->wr_callback;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	97 self->wr_callback = NULL;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	98 clear_weakref(self);
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	99 self->wr_callback = callback;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	100 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	101
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	102 static void
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	103 weakref_dealloc(PyObject *self)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	104 {
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	105 PyObject_GC_UnTrack(self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	106 clear_weakref((PyWeakReference *) self);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	107 Py_TYPE(self)->tp_free(self);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	108 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	109
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	110
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	111 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	112 gc_traverse(PyWeakReference self, visitproc visit, void arg)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	113 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	114 Py_VISIT(self->wr_callback);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	115 return 0;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	116 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	117
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	118
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	119 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	120 gc_clear(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	121 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	122 clear_weakref(self);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	123 return 0;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	124 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	125
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	126
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	127 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	128 weakref_call(PyWeakReference self, PyObject args, PyObject *kw)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	129 {
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	130 static char *kwlist[] = {NULL};
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	131
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	132 if (PyArg_ParseTupleAndKeywords(args, kw, ":__call__", kwlist)) {
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	133 PyObject *object = PyWeakref_GET_OBJECT(self);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	134 Py_INCREF(object);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	135 return (object);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	136 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	137 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	138 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	139
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	140
65494 e8969fb822fc make hashes always the size of pointers; introduce Py_hash_t #9778 Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	141 static Py_hash_t
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	142 weakref_hash(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	143 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	144 if (self->hash != -1)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	145 return self->hash;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	146 if (PyWeakref_GET_OBJECT(self) == Py_None) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	147 PyErr_SetString(PyExc_TypeError, "weak object has gone away");
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	148 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	149 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	150 self->hash = PyObject_Hash(PyWeakref_GET_OBJECT(self));
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	151 return self->hash;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	152 }
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	153
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	154
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	155 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	156 weakref_repr(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	157 {
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	158 PyObject name, repr;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	159 _Py_IDENTIFIER(__name__);
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	160
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	161 if (PyWeakref_GET_OBJECT(self) == Py_None)
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	162 return PyUnicode_FromFormat("<weakref at %p; dead>", self);
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	163
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	164 name = _PyObject_GetAttrId(PyWeakref_GET_OBJECT(self), &PyId___name__);
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	165 if (name == NULL \|\| !PyUnicode_Check(name)) {
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	166 if (name == NULL)
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	167 PyErr_Clear();
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	168 repr = PyUnicode_FromFormat(
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	169 "<weakref at %p; to '%s' at %p>",
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	170 self,
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	171 Py_TYPE(PyWeakref_GET_OBJECT(self))->tp_name,
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	172 PyWeakref_GET_OBJECT(self));
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	173 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	174 else {
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	175 repr = PyUnicode_FromFormat(
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	176 "<weakref at %p; to '%s' at %p (%U)>",
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	177 self,
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	178 Py_TYPE(PyWeakref_GET_OBJECT(self))->tp_name,
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	179 PyWeakref_GET_OBJECT(self),
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	180 name);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	181 }
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	182 Py_XDECREF(name);
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	183 return repr;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	184 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	185
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	186 /* Weak references only support equality, not ordering. Two weak references
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	187 are equal if the underlying objects are equal. If the underlying object has
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	188 gone away, they are equal if they are identical. */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	189
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	190 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	191 weakref_richcompare(PyWeakReference* self, PyWeakReference* other, int op)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	192 {
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	193 if ((op != Py_EQ && op != Py_NE) \|\|
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	194 !PyWeakref_Check(self) \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	195 !PyWeakref_Check(other)) {
71810 d0b0fcbb40db Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED. Brian Curtin <brian@python.org> parents: 68808 diff changeset	196 Py_RETURN_NOTIMPLEMENTED;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	197 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	198 if (PyWeakref_GET_OBJECT(self) == Py_None
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	199 \|\| PyWeakref_GET_OBJECT(other) == Py_None) {
80394 590f1b55abea Issue #16453: Fix equality testing of dead weakref objects. Antoine Pitrou <solipsis@pitrou.net> parents: 66104 diff changeset	200 int res = (self == other);
590f1b55abea Issue #16453: Fix equality testing of dead weakref objects. Antoine Pitrou <solipsis@pitrou.net> parents: 66104 diff changeset	201 if (op == Py_NE)
590f1b55abea Issue #16453: Fix equality testing of dead weakref objects. Antoine Pitrou <solipsis@pitrou.net> parents: 66104 diff changeset	202 res = !res;
590f1b55abea Issue #16453: Fix equality testing of dead weakref objects. Antoine Pitrou <solipsis@pitrou.net> parents: 66104 diff changeset	203 if (res)
590f1b55abea Issue #16453: Fix equality testing of dead weakref objects. Antoine Pitrou <solipsis@pitrou.net> parents: 66104 diff changeset	204 Py_RETURN_TRUE;
590f1b55abea Issue #16453: Fix equality testing of dead weakref objects. Antoine Pitrou <solipsis@pitrou.net> parents: 66104 diff changeset	205 else
590f1b55abea Issue #16453: Fix equality testing of dead weakref objects. Antoine Pitrou <solipsis@pitrou.net> parents: 66104 diff changeset	206 Py_RETURN_FALSE;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	207 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	208 return PyObject_RichCompare(PyWeakref_GET_OBJECT(self),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	209 PyWeakref_GET_OBJECT(other), op);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	210 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	211
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	212 /* Given the head of an object's list of weak references, extract the
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	213 * two callback-less refs (ref and proxy). Used to determine if the
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	214 * shared references exist and to determine the back link for newly
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	215 * inserted references.
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	216 */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	217 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	218 get_basic_refs(PyWeakReference *head,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	219 PyWeakReference refp, PyWeakReference proxyp)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	220 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	221 *refp = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	222 *proxyp = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	223
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	224 if (head != NULL && head->wr_callback == NULL) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	225 /* We need to be careful that the "basic refs" aren't
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	226 subclasses of the main types. That complicates this a
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	227 little. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	228 if (PyWeakref_CheckRefExact(head)) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	229 *refp = head;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	230 head = head->wr_next;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	231 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	232 if (head != NULL
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	233 && head->wr_callback == NULL
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	234 && PyWeakref_CheckProxy(head)) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	235 *proxyp = head;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	236 /* head = head->wr_next; */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	237 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	238 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	239 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	240
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	241 /* Insert 'newref' in the list after 'prev'. Both must be non-NULL. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	242 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	243 insert_after(PyWeakReference newref, PyWeakReference prev)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	244 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	245 newref->wr_prev = prev;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	246 newref->wr_next = prev->wr_next;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	247 if (prev->wr_next != NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	248 prev->wr_next->wr_prev = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	249 prev->wr_next = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	250 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	251
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	252 /* Insert 'newref' at the head of the list; 'list' points to the variable
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	253 * that stores the head.
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	254 */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	255 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	256 insert_head(PyWeakReference newref, PyWeakReference *list)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	257 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	258 PyWeakReference next = list;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	259
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	260 newref->wr_prev = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	261 newref->wr_next = next;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	262 if (next != NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	263 next->wr_prev = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	264 *list = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	265 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	266
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	267 static int
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	268 parse_weakref_init_args(char funcname, PyObject args, PyObject *kwargs,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	269 PyObject obp, PyObject callbackp)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	270 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	271 /* XXX Should check that kwargs == NULL or is empty. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	272 return PyArg_UnpackTuple(args, funcname, 1, 2, obp, callbackp);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	273 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	274
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	275 static PyObject *
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	276 weakref___new__(PyTypeObject type, PyObject args, PyObject *kwargs)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	277 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	278 PyWeakReference *self = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	279 PyObject ob, callback = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	280
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	281 if (parse_weakref_init_args("__new__", args, kwargs, &ob, &callback)) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	282 PyWeakReference ref, proxy;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	283 PyWeakReference **list;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	284
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	285 if (!PyType_SUPPORTS_WEAKREFS(Py_TYPE(ob))) {
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	286 PyErr_Format(PyExc_TypeError,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	287 "cannot create weak reference to '%s' object",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	288 Py_TYPE(ob)->tp_name);
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	289 return NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	290 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	291 if (callback == Py_None)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	292 callback = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	293 list = GET_WEAKREFS_LISTPTR(ob);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	294 get_basic_refs(*list, &ref, &proxy);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	295 if (callback == NULL && type == &_PyWeakref_RefType) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	296 if (ref != NULL) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	297 /* We can re-use an existing reference. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	298 Py_INCREF(ref);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	299 return (PyObject *)ref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	300 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	301 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	302 /* We have to create a new reference. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	303 /* Note: the tp_alloc() can trigger cyclic GC, so the weakref
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	304 list on ob can be mutated. This means that the ref and
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	305 proxy pointers we got back earlier may have been collected,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	306 so we need to compute these values again before we use
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	307 them. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	308 self = (PyWeakReference *) (type->tp_alloc(type, 0));
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	309 if (self != NULL) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	310 init_weakref(self, ob, callback);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	311 if (callback == NULL && type == &_PyWeakref_RefType) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	312 insert_head(self, list);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	313 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	314 else {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	315 PyWeakReference *prev;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	316
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	317 get_basic_refs(*list, &ref, &proxy);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	318 prev = (proxy == NULL) ? ref : proxy;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	319 if (prev == NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	320 insert_head(self, list);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	321 else
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	322 insert_after(self, prev);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	323 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	324 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	325 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	326 return (PyObject *)self;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	327 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	328
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	329 static int
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	330 weakref___init__(PyObject self, PyObject args, PyObject *kwargs)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	331 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	332 PyObject *tmp;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	333
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	334 if (parse_weakref_init_args("__init__", args, kwargs, &tmp, &tmp))
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	335 return 0;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	336 else
49137 17475eb55067 Merged revisions 66337,66347,66350,66352,66358 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	337 return -1;
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	338 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	339
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	340
83286 9e7d31b04d78 Issue #17643: Add __callback__ attribute to weakref.ref. Mark Dickinson <dickinsm@gmail.com> parents: 81895 diff changeset	341 static PyMemberDef weakref_members[] = {
9e7d31b04d78 Issue #17643: Add __callback__ attribute to weakref.ref. Mark Dickinson <dickinsm@gmail.com> parents: 81895 diff changeset	342 {"__callback__", T_OBJECT, offsetof(PyWeakReference, wr_callback), READONLY},
9e7d31b04d78 Issue #17643: Add __callback__ attribute to weakref.ref. Mark Dickinson <dickinsm@gmail.com> parents: 81895 diff changeset	343 {NULL} /* Sentinel */
9e7d31b04d78 Issue #17643: Add __callback__ attribute to weakref.ref. Mark Dickinson <dickinsm@gmail.com> parents: 81895 diff changeset	344 };
9e7d31b04d78 Issue #17643: Add __callback__ attribute to weakref.ref. Mark Dickinson <dickinsm@gmail.com> parents: 81895 diff changeset	345
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	346 PyTypeObject
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	347 _PyWeakref_RefType = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41769 diff changeset	348 PyVarObject_HEAD_INIT(&PyType_Type, 0)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	349 "weakref",
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	350 sizeof(PyWeakReference),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	351 0,
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	352 weakref_dealloc, /tp_dealloc/
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	353 0, /tp_print/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	354 0, /tp_getattr/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	355 0, /tp_setattr/
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	356 0, /tp_reserved/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	357 (reprfunc)weakref_repr, /tp_repr/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	358 0, /tp_as_number/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	359 0, /tp_as_sequence/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	360 0, /tp_as_mapping/
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	361 (hashfunc)weakref_hash, /tp_hash/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	362 (ternaryfunc)weakref_call, /tp_call/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	363 0, /tp_str/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	364 0, /tp_getattro/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	365 0, /tp_setattro/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	366 0, /tp_as_buffer/
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	367 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	368 \| Py_TPFLAGS_BASETYPE, /tp_flags/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	369 0, /tp_doc/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	370 (traverseproc)gc_traverse, /tp_traverse/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	371 (inquiry)gc_clear, /tp_clear/
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	372 (richcmpfunc)weakref_richcompare, /tp_richcompare/
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	373 0, /tp_weaklistoffset/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	374 0, /tp_iter/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	375 0, /tp_iternext/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	376 0, /tp_methods/
83286 9e7d31b04d78 Issue #17643: Add __callback__ attribute to weakref.ref. Mark Dickinson <dickinsm@gmail.com> parents: 81895 diff changeset	377 weakref_members, /tp_members/
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	378 0, /tp_getset/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	379 0, /tp_base/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	380 0, /tp_dict/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	381 0, /tp_descr_get/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	382 0, /tp_descr_set/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	383 0, /tp_dictoffset/
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	384 weakref___init__, /tp_init/
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	385 PyType_GenericAlloc, /tp_alloc/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	386 weakref___new__, /tp_new/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	387 PyObject_GC_Del, /tp_free/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	388 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	389
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	390
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	391 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	392 proxy_checkref(PyWeakReference *proxy)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	393 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	394 if (PyWeakref_GET_OBJECT(proxy) == Py_None) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	395 PyErr_SetString(PyExc_ReferenceError,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	396 "weakly-referenced object no longer exists");
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	397 return 0;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	398 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	399 return 1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	400 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	401
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	402
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	403 /* If a parameter is a proxy, check that it is still "live" and wrap it,
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	404 * replacing the original value with the raw object. Raises ReferenceError
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	405 * if the param is a dead proxy.
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	406 */
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	407 #define UNWRAP(o) \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	408 if (PyWeakref_CheckProxy(o)) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	409 if (!proxy_checkref((PyWeakReference *)o)) \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	410 return NULL; \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	411 o = PyWeakref_GET_OBJECT(o); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	412 }
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	413
21483 873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	414 #define UNWRAP_I(o) \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	415 if (PyWeakref_CheckProxy(o)) { \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	416 if (!proxy_checkref((PyWeakReference *)o)) \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	417 return -1; \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	418 o = PyWeakref_GET_OBJECT(o); \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	419 }
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	420
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	421 #define WRAP_UNARY(method, generic) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	422 static PyObject * \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	423 method(PyObject *proxy) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	424 UNWRAP(proxy); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	425 return generic(proxy); \
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	426 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	427
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	428 #define WRAP_BINARY(method, generic) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	429 static PyObject * \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	430 method(PyObject x, PyObject y) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	431 UNWRAP(x); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	432 UNWRAP(y); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	433 return generic(x, y); \
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	434 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	435
20532 bc138bc73cdd Remove an unnecessary check for NULL. Fred Drake <fdrake@acm.org> parents: 20521 diff changeset	436 /* Note that the third arg needs to be checked for NULL since the tp_call
bc138bc73cdd Remove an unnecessary check for NULL. Fred Drake <fdrake@acm.org> parents: 20521 diff changeset	437 * slot can receive NULL for this arg.
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	438 */
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	439 #define WRAP_TERNARY(method, generic) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	440 static PyObject * \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	441 method(PyObject proxy, PyObject v, PyObject *w) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	442 UNWRAP(proxy); \
20532 bc138bc73cdd Remove an unnecessary check for NULL. Fred Drake <fdrake@acm.org> parents: 20521 diff changeset	443 UNWRAP(v); \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	444 if (w != NULL) \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	445 UNWRAP(w); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	446 return generic(proxy, v, w); \
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	447 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	448
57348 42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	449 #define WRAP_METHOD(method, special) \
42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	450 static PyObject * \
42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	451 method(PyObject *proxy) { \
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	452 _Py_IDENTIFIER(special); \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	453 UNWRAP(proxy); \
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 71810 diff changeset	454 return _PyObject_CallMethodId(proxy, &PyId_##special, ""); \
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	455 }
57348 42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	456
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	457
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	458 /* direct slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	459
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	460 WRAP_BINARY(proxy_getattr, PyObject_GetAttr)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	461 WRAP_UNARY(proxy_str, PyObject_Str)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	462 WRAP_TERNARY(proxy_call, PyEval_CallObjectWithKeywords)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	463
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	464 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	465 proxy_repr(PyWeakReference *proxy)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	466 {
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	467 return PyUnicode_FromFormat(
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	468 "<weakproxy at %p to %s at %p>",
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	469 proxy,
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	470 Py_TYPE(PyWeakref_GET_OBJECT(proxy))->tp_name,
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68102 diff changeset	471 PyWeakref_GET_OBJECT(proxy));
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	472 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	473
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	474
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	475 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	476 proxy_setattr(PyWeakReference proxy, PyObject name, PyObject *value)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	477 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	478 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	479 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	480 return PyObject_SetAttr(PyWeakref_GET_OBJECT(proxy), name, value);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	481 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	482
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	483 static PyObject *
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	484 proxy_richcompare(PyObject proxy, PyObject v, int op)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	485 {
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	486 UNWRAP(proxy);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	487 UNWRAP(v);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	488 return PyObject_RichCompare(proxy, v, op);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	489 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	490
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	491 /* number slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	492 WRAP_BINARY(proxy_add, PyNumber_Add)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	493 WRAP_BINARY(proxy_sub, PyNumber_Subtract)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	494 WRAP_BINARY(proxy_mul, PyNumber_Multiply)
47278 f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	495 WRAP_BINARY(proxy_floor_div, PyNumber_FloorDivide)
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	496 WRAP_BINARY(proxy_true_div, PyNumber_TrueDivide)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	497 WRAP_BINARY(proxy_mod, PyNumber_Remainder)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	498 WRAP_BINARY(proxy_divmod, PyNumber_Divmod)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	499 WRAP_TERNARY(proxy_pow, PyNumber_Power)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	500 WRAP_UNARY(proxy_neg, PyNumber_Negative)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	501 WRAP_UNARY(proxy_pos, PyNumber_Positive)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	502 WRAP_UNARY(proxy_abs, PyNumber_Absolute)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	503 WRAP_UNARY(proxy_invert, PyNumber_Invert)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	504 WRAP_BINARY(proxy_lshift, PyNumber_Lshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	505 WRAP_BINARY(proxy_rshift, PyNumber_Rshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	506 WRAP_BINARY(proxy_and, PyNumber_And)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	507 WRAP_BINARY(proxy_xor, PyNumber_Xor)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	508 WRAP_BINARY(proxy_or, PyNumber_Or)
50866 8325eb041921 Merged revisions 68675 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50829 diff changeset	509 WRAP_UNARY(proxy_int, PyNumber_Long)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	510 WRAP_UNARY(proxy_float, PyNumber_Float)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	511 WRAP_BINARY(proxy_iadd, PyNumber_InPlaceAdd)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	512 WRAP_BINARY(proxy_isub, PyNumber_InPlaceSubtract)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	513 WRAP_BINARY(proxy_imul, PyNumber_InPlaceMultiply)
47278 f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	514 WRAP_BINARY(proxy_ifloor_div, PyNumber_InPlaceFloorDivide)
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	515 WRAP_BINARY(proxy_itrue_div, PyNumber_InPlaceTrueDivide)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	516 WRAP_BINARY(proxy_imod, PyNumber_InPlaceRemainder)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	517 WRAP_TERNARY(proxy_ipow, PyNumber_InPlacePower)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	518 WRAP_BINARY(proxy_ilshift, PyNumber_InPlaceLshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	519 WRAP_BINARY(proxy_irshift, PyNumber_InPlaceRshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	520 WRAP_BINARY(proxy_iand, PyNumber_InPlaceAnd)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	521 WRAP_BINARY(proxy_ixor, PyNumber_InPlaceXor)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	522 WRAP_BINARY(proxy_ior, PyNumber_InPlaceOr)
47278 f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	523 WRAP_UNARY(proxy_index, PyNumber_Index)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	524
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	525 static int
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39644 diff changeset	526 proxy_bool(PyWeakReference *proxy)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	527 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	528 PyObject *o = PyWeakref_GET_OBJECT(proxy);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	529 if (!proxy_checkref(proxy))
32530 2451c9572edf SF bug #978308, Spurious errors taking bool of dead pro Neal Norwitz <nnorwitz@gmail.com> parents: 32472 diff changeset	530 return -1;
34847 51ba8ce8d92a SF bug #1770766: weakref proxy has incorrect __nonzero__ behavior. Raymond Hettinger <python@rcn.com> parents: 33862 diff changeset	531 return PyObject_IsTrue(o);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	532 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	533
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	534 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	535 proxy_dealloc(PyWeakReference *self)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	536 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	537 if (self->wr_callback != NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	538 PyObject_GC_UnTrack((PyObject *)self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	539 clear_weakref(self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	540 PyObject_GC_Del(self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	541 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	542
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	543 /* sequence slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	544
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	545 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	546 proxy_contains(PyWeakReference proxy, PyObject value)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	547 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	548 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	549 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	550 return PySequence_Contains(PyWeakref_GET_OBJECT(proxy), value);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	551 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	552
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	553
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	554 /* mapping slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	555
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	556 static Py_ssize_t
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	557 proxy_length(PyWeakReference *proxy)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	558 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	559 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	560 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	561 return PyObject_Length(PyWeakref_GET_OBJECT(proxy));
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	562 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	563
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	564 WRAP_BINARY(proxy_getitem, PyObject_GetItem)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	565
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	566 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	567 proxy_setitem(PyWeakReference proxy, PyObject key, PyObject *value)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	568 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	569 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	570 return -1;
29697 1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	571
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	572 if (value == NULL)
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	573 return PyObject_DelItem(PyWeakref_GET_OBJECT(proxy), key);
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	574 else
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	575 return PyObject_SetItem(PyWeakref_GET_OBJECT(proxy), key, value);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	576 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	577
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	578 /* iterator slots */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	579
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	580 static PyObject *
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	581 proxy_iter(PyWeakReference *proxy)
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	582 {
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	583 if (!proxy_checkref(proxy))
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	584 return NULL;
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	585 return PyObject_GetIter(PyWeakref_GET_OBJECT(proxy));
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	586 }
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	587
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	588 static PyObject *
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	589 proxy_iternext(PyWeakReference *proxy)
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	590 {
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	591 if (!proxy_checkref(proxy))
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	592 return NULL;
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	593 return PyIter_Next(PyWeakref_GET_OBJECT(proxy));
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	594 }
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	595
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	596
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 71810 diff changeset	597 WRAP_METHOD(proxy_bytes, __bytes__)
57348 42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	598
42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	599
42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	600 static PyMethodDef proxy_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	601 {"__bytes__", (PyCFunction)proxy_bytes, METH_NOARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	602 {NULL, NULL}
57348 42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	603 };
42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	604
42aaedaefbcb Merged revisions 76396 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	605
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	606 static PyNumberMethods proxy_as_number = {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	607 proxy_add, /nb_add/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	608 proxy_sub, /nb_subtract/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	609 proxy_mul, /nb_multiply/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	610 proxy_mod, /nb_remainder/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	611 proxy_divmod, /nb_divmod/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	612 proxy_pow, /nb_power/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	613 proxy_neg, /nb_negative/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	614 proxy_pos, /nb_positive/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	615 proxy_abs, /nb_absolute/
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39644 diff changeset	616 (inquiry)proxy_bool, /nb_bool/
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	617 proxy_invert, /nb_invert/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	618 proxy_lshift, /nb_lshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	619 proxy_rshift, /nb_rshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	620 proxy_and, /nb_and/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	621 proxy_xor, /nb_xor/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	622 proxy_or, /nb_or/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	623 proxy_int, /nb_int/
50829 af02b6e42142 Merged revisions 68650-68653 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50804 diff changeset	624 0, /nb_reserved/
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	625 proxy_float, /nb_float/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	626 proxy_iadd, /nb_inplace_add/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	627 proxy_isub, /nb_inplace_subtract/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	628 proxy_imul, /nb_inplace_multiply/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	629 proxy_imod, /nb_inplace_remainder/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	630 proxy_ipow, /nb_inplace_power/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	631 proxy_ilshift, /nb_inplace_lshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	632 proxy_irshift, /nb_inplace_rshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	633 proxy_iand, /nb_inplace_and/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	634 proxy_ixor, /nb_inplace_xor/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	635 proxy_ior, /nb_inplace_or/
47278 f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	636 proxy_floor_div, /nb_floor_divide/
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	637 proxy_true_div, /nb_true_divide/
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	638 proxy_ifloor_div, /nb_inplace_floor_divide/
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	639 proxy_itrue_div, /nb_inplace_true_divide/
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 44351 diff changeset	640 proxy_index, /nb_index/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	641 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	642
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	643 static PySequenceMethods proxy_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	644 (lenfunc)proxy_length, /sq_length/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	645 0, /sq_concat/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	646 0, /sq_repeat/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	647 0, /sq_item/
43100 4e6b4ba60c3b Remove the simple slicing API. All slicing is now done with slice objects. Thomas Wouters <thomas@python.org> parents: 42824 diff changeset	648 0, /sq_slice/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	649 0, /sq_ass_item/
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	650 0, /sq_ass_slice/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	651 (objobjproc)proxy_contains, /* sq_contains */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	652 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	653
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	654 static PyMappingMethods proxy_as_mapping = {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	655 (lenfunc)proxy_length, /mp_length/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	656 proxy_getitem, /mp_subscript/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	657 (objobjargproc)proxy_setitem, /mp_ass_subscript/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	658 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	659
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	660
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	661 PyTypeObject
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	662 _PyWeakref_ProxyType = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41769 diff changeset	663 PyVarObject_HEAD_INIT(&PyType_Type, 0)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	664 "weakproxy",
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	665 sizeof(PyWeakReference),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	666 0,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	667 /* methods */
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	668 (destructor)proxy_dealloc, /* tp_dealloc */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	669 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	670 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	671 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	672 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	673 (reprfunc)proxy_repr, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	674 &proxy_as_number, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	675 &proxy_as_sequence, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	676 &proxy_as_mapping, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	677 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	678 0, /* tp_call */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	679 proxy_str, /* tp_str */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	680 proxy_getattr, /* tp_getattro */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	681 (setattrofunc)proxy_setattr, /* tp_setattro */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	682 0, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	683 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	684 0, /* tp_doc */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	685 (traverseproc)gc_traverse, /* tp_traverse */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	686 (inquiry)gc_clear, /* tp_clear */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	687 proxy_richcompare, /* tp_richcompare */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	688 0, /* tp_weaklistoffset */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	689 (getiterfunc)proxy_iter, /* tp_iter */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	690 (iternextfunc)proxy_iternext, /* tp_iternext */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	691 proxy_methods, /* tp_methods */
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	692 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	693
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	694
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	695 PyTypeObject
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	696 _PyWeakref_CallableProxyType = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41769 diff changeset	697 PyVarObject_HEAD_INIT(&PyType_Type, 0)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	698 "weakcallableproxy",
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	699 sizeof(PyWeakReference),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	700 0,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	701 /* methods */
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	702 (destructor)proxy_dealloc, /* tp_dealloc */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	703 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	704 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	705 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	706 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	707 (unaryfunc)proxy_repr, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	708 &proxy_as_number, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	709 &proxy_as_sequence, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	710 &proxy_as_mapping, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	711 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	712 proxy_call, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	713 proxy_str, /* tp_str */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	714 proxy_getattr, /* tp_getattro */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	715 (setattrofunc)proxy_setattr, /* tp_setattro */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	716 0, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	717 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	718 0, /* tp_doc */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	719 (traverseproc)gc_traverse, /* tp_traverse */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	720 (inquiry)gc_clear, /* tp_clear */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	721 proxy_richcompare, /* tp_richcompare */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	722 0, /* tp_weaklistoffset */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	723 (getiterfunc)proxy_iter, /* tp_iter */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	724 (iternextfunc)proxy_iternext, /* tp_iternext */
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	725 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	726
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	727
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	728
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	729 PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	730 PyWeakref_NewRef(PyObject ob, PyObject callback)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	731 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	732 PyWeakReference *result = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	733 PyWeakReference **list;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	734 PyWeakReference ref, proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	735
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	736 if (!PyType_SUPPORTS_WEAKREFS(Py_TYPE(ob))) {
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	737 PyErr_Format(PyExc_TypeError,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	738 "cannot create weak reference to '%s' object",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	739 Py_TYPE(ob)->tp_name);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	740 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	741 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	742 list = GET_WEAKREFS_LISTPTR(ob);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	743 get_basic_refs(*list, &ref, &proxy);
31449 b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	744 if (callback == Py_None)
b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	745 callback = NULL;
b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	746 if (callback == NULL)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	747 /* return existing weak reference if it exists */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	748 result = ref;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	749 if (result != NULL)
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	750 Py_INCREF(result);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	751 else {
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	752 /* Note: new_weakref() can trigger cyclic GC, so the weakref
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	753 list on ob can be mutated. This means that the ref and
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	754 proxy pointers we got back earlier may have been collected,
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	755 so we need to compute these values again before we use
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	756 them. */
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	757 result = new_weakref(ob, callback);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	758 if (result != NULL) {
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	759 get_basic_refs(*list, &ref, &proxy);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	760 if (callback == NULL) {
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	761 if (ref == NULL)
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	762 insert_head(result, list);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	763 else {
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	764 /* Someone else added a ref without a callback
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	765 during GC. Return that one instead of this one
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	766 to avoid violating the invariants of the list
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	767 of weakrefs for ob. */
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	768 Py_DECREF(result);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	769 Py_INCREF(ref);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	770 result = ref;
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	771 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	772 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	773 else {
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	774 PyWeakReference *prev;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	775
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	776 prev = (proxy == NULL) ? ref : proxy;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	777 if (prev == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	778 insert_head(result, list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	779 else
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	780 insert_after(result, prev);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	781 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	782 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	783 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	784 return (PyObject *) result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	785 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	786
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	787
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	788 PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	789 PyWeakref_NewProxy(PyObject ob, PyObject callback)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	790 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	791 PyWeakReference *result = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	792 PyWeakReference **list;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	793 PyWeakReference ref, proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	794
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	795 if (!PyType_SUPPORTS_WEAKREFS(Py_TYPE(ob))) {
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	796 PyErr_Format(PyExc_TypeError,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	797 "cannot create weak reference to '%s' object",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	798 Py_TYPE(ob)->tp_name);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	799 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	800 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	801 list = GET_WEAKREFS_LISTPTR(ob);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	802 get_basic_refs(*list, &ref, &proxy);
31449 b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	803 if (callback == Py_None)
b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	804 callback = NULL;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	805 if (callback == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	806 /* attempt to return an existing weak reference if it exists */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	807 result = proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	808 if (result != NULL)
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	809 Py_INCREF(result);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	810 else {
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	811 /* Note: new_weakref() can trigger cyclic GC, so the weakref
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	812 list on ob can be mutated. This means that the ref and
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	813 proxy pointers we got back earlier may have been collected,
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	814 so we need to compute these values again before we use
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	815 them. */
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	816 result = new_weakref(ob, callback);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	817 if (result != NULL) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	818 PyWeakReference *prev;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	819
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	820 if (PyCallable_Check(ob))
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	821 Py_TYPE(result) = &_PyWeakref_CallableProxyType;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	822 else
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	823 Py_TYPE(result) = &_PyWeakref_ProxyType;
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	824 get_basic_refs(*list, &ref, &proxy);
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	825 if (callback == NULL) {
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	826 if (proxy != NULL) {
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	827 /* Someone else added a proxy without a callback
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	828 during GC. Return that one instead of this one
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	829 to avoid violating the invariants of the list
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	830 of weakrefs for ob. */
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	831 Py_DECREF(result);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	832 Py_INCREF(result = proxy);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	833 goto skip_insert;
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	834 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	835 prev = ref;
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	836 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	837 else
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	838 prev = (proxy == NULL) ? ref : proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	839
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	840 if (prev == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	841 insert_head(result, list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	842 else
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	843 insert_after(result, prev);
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	844 skip_insert:
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	845 ;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	846 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	847 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	848 return (PyObject *) result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	849 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	850
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	851
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	852 PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	853 PyWeakref_GetObject(PyObject *ref)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	854 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	855 if (ref == NULL \|\| !PyWeakref_Check(ref)) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	856 PyErr_BadInternalCall();
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	857 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	858 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	859 return PyWeakref_GET_OBJECT(ref);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	860 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	861
33862 facb5a2f4b53 SF 1055820: weakref callback vs gc vs threads Tim Peters <tim.peters@gmail.com> parents: 32932 diff changeset	862 /* Note that there's an inlined copy-paste of handle_callback() in gcmodule.c's
facb5a2f4b53 SF 1055820: weakref callback vs gc vs threads Tim Peters <tim.peters@gmail.com> parents: 32932 diff changeset	863 * handle_weakrefs().
facb5a2f4b53 SF 1055820: weakref callback vs gc vs threads Tim Peters <tim.peters@gmail.com> parents: 32932 diff changeset	864 */
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	865 static void
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	866 handle_callback(PyWeakReference ref, PyObject callback)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	867 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	868 PyObject *cbresult = PyObject_CallFunctionObjArgs(callback, ref, NULL);
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	869
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	870 if (cbresult == NULL)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	871 PyErr_WriteUnraisable(callback);
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	872 else
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	873 Py_DECREF(cbresult);
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	874 }
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	875
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	876 /* This function is called by the tp_dealloc handler to clear weak references.
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	877 *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	878 * This iterates through the weak references for 'object' and calls callbacks
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	879 * for those references which have one. It returns when all callbacks have
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	880 * been attempted.
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	881 */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	882 void
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	883 PyObject_ClearWeakRefs(PyObject *object)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	884 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	885 PyWeakReference **list;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	886
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	887 if (object == NULL
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	888 \|\| !PyType_SUPPORTS_WEAKREFS(Py_TYPE(object))
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	889 \|\| object->ob_refcnt != 0) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	890 PyErr_BadInternalCall();
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	891 return;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	892 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	893 list = GET_WEAKREFS_LISTPTR(object);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	894 /* Remove the callback-less basic and proxy references */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	895 if (list != NULL && (list)->wr_callback == NULL) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	896 clear_weakref(*list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	897 if (list != NULL && (list)->wr_callback == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	898 clear_weakref(*list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	899 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	900 if (*list != NULL) {
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	901 PyWeakReference current = list;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	902 Py_ssize_t count = _PyWeakref_GetWeakrefCount(current);
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	903 int restore_error = PyErr_Occurred() ? 1 : 0;
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	904 PyObject err_type, err_value, *err_tb;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	905
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	906 if (restore_error)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	907 PyErr_Fetch(&err_type, &err_value, &err_tb);
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	908 if (count == 1) {
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	909 PyObject *callback = current->wr_callback;
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	910
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	911 current->wr_callback = NULL;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	912 clear_weakref(current);
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	913 if (callback != NULL) {
47738 84590a64f3a2 add some casts and fix the build from 64311 Benjamin Peterson <benjamin@python.org> parents: 47734 diff changeset	914 if (((PyObject *)current)->ob_refcnt > 0)
47734 5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	915 handle_callback(current, callback);
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	916 Py_DECREF(callback);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	917 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	918 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	919 else {
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	920 PyObject *tuple;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	921 Py_ssize_t i = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57348 diff changeset	922
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	923 tuple = PyTuple_New(count * 2);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	924 if (tuple == NULL) {
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	925 if (restore_error)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	926 PyErr_Fetch(&err_type, &err_value, &err_tb);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	927 return;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	928 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	929
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	930 for (i = 0; i < count; ++i) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	931 PyWeakReference *next = current->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	932
47738 84590a64f3a2 add some casts and fix the build from 64311 Benjamin Peterson <benjamin@python.org> parents: 47734 diff changeset	933 if (((PyObject *)current)->ob_refcnt > 0)
47734 5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	934 {
5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	935 Py_INCREF(current);
5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	936 PyTuple_SET_ITEM(tuple, i * 2, (PyObject *) current);
5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	937 PyTuple_SET_ITEM(tuple, i * 2 + 1, current->wr_callback);
5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	938 }
5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	939 else {
5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	940 Py_DECREF(current->wr_callback);
5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	941 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	942 current->wr_callback = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	943 clear_weakref(current);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	944 current = next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	945 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	946 for (i = 0; i < count; ++i) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	947 PyObject callback = PyTuple_GET_ITEM(tuple, i 2 + 1);
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	948
47734 5c85d55c4fb2 Merged revisions 64309 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47620 diff changeset	949 /* The tuple may have slots left to NULL */
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	950 if (callback != NULL) {
36244 e7880f4f53a4 Remove some shadowed variables Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	951 PyObject item = PyTuple_GET_ITEM(tuple, i 2);
e7880f4f53a4 Remove some shadowed variables Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	952 handle_callback((PyWeakReference *)item, callback);
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	953 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	954 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	955 Py_DECREF(tuple);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	956 }
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	957 if (restore_error)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	958 PyErr_Restore(err_type, err_value, err_tb);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	959 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	960 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/weakrefobject.c @ 87690:66c1c9f32567 default tip