cpython-lru_cache-weakref: Lib/weakref.py annotate

annotate Lib/weakref.py @ 51749:1408feec0084 3.0

Merged revisions 69798 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r69798 | benjamin.peterson | 2009-02-19 22:02:38 -0600 (Thu, 19 Feb 2009) | 13 lines Merged revisions 69769,69776 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r69769 | georg.brandl | 2009-02-19 02:30:06 -0600 (Thu, 19 Feb 2009) | 1 line #5310, #3558: fix operator precedence table. ........ r69776 | georg.brandl | 2009-02-19 10:34:51 -0600 (Thu, 19 Feb 2009) | 2 lines #5317: update IronPython URL. ........ ................

author	Benjamin Peterson <benjamin@python.org>
date	Fri, 20 Feb 2009 04:05:32 +0000
parents	5b7845ef4efd
children	8b5a80f53317

rev	line source
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	1 """Weak reference support for Python.
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	2
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	3 This module is an implementation of PEP 205:
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	4
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45284 diff changeset	5 http://www.python.org/dev/peps/pep-0205/
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	6 """
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	7
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	8 # Naming convention: Variables named "wr" are weak reference objects;
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	9 # they are called this instead of "ref" to avoid name collisions with
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	10 # the module-global ref() function imported from _weakref.
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	11
45161 bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	12 import collections
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	13
33356 e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	14 from _weakref import (
e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	15 getweakrefcount,
e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	16 getweakrefs,
e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	17 ref,
e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	18 proxy,
e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	19 CallableProxyType,
e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	20 ProxyType,
e56192e9fd7e Use multi-line import Andrew M. Kuchling <amk@amk.ca> parents: 33197 diff changeset	21 ReferenceType)
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	22
45159 e6069b24031e Moved WeakSet into a bootstap module use by abc.py. Raymond Hettinger <python@rcn.com> parents: 43644 diff changeset	23 from _weakrefset import WeakSet
20281 380d4b4ee602 ReferenceError is now built-in, so pick it up from the right place. Fred Drake <fdrake@acm.org> parents: 20155 diff changeset	24
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	25 ProxyTypes = (ProxyType, CallableProxyType)
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	26
17386 bbcc9837312e mapping(): Remove this function since it does not add anything to the API. Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	27 __all__ = ["ref", "proxy", "getweakrefcount", "getweakrefs",
48739 3195bd6b6dd7 ReferenceError is undefined. causes test___all__.py to fail. remove it from __all__ Gregory P. Smith <greg@mad-scientist.com> parents: 48733 diff changeset	28 "WeakKeyDictionary", "ReferenceType", "ProxyType",
45159 e6069b24031e Moved WeakSet into a bootstap module use by abc.py. Raymond Hettinger <python@rcn.com> parents: 43644 diff changeset	29 "CallableProxyType", "ProxyTypes", "WeakValueDictionary",
e6069b24031e Moved WeakSet into a bootstap module use by abc.py. Raymond Hettinger <python@rcn.com> parents: 43644 diff changeset	30 "WeakSet"]
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	31
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	32
45161 bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	33 class WeakValueDictionary(collections.MutableMapping):
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	34 """Mapping class that references values weakly.
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	35
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	36 Entries in the dictionary will be discarded when no strong
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	37 reference to the value exists anymore
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	38 """
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	39 # We inherit the constructor without worrying about the input
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	40 # dictionary; since it uses our .update() method, we get the right
16884 1ce751fa67d8 Change WeakDictionary to WeakValueDictionary in a couple more places. Fred Drake <fdrake@acm.org> parents: 16794 diff changeset	41 # checks (if the other dictionary is a WeakValueDictionary,
1ce751fa67d8 Change WeakDictionary to WeakValueDictionary in a couple more places. Fred Drake <fdrake@acm.org> parents: 16794 diff changeset	42 # objects are unwrapped on the way out, and we always wrap on the
1ce751fa67d8 Change WeakDictionary to WeakValueDictionary in a couple more places. Fred Drake <fdrake@acm.org> parents: 16794 diff changeset	43 # way in).
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	44
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	45 def __init__(self, args, *kw):
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	46 def remove(wr, selfref=ref(self)):
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	47 self = selfref()
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	48 if self is not None:
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	49 del self.data[wr.key]
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	50 self._remove = remove
45161 bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	51 self.data = d = {}
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	52 d.update(args, *kw)
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	53
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	54 def __getitem__(self, key):
18952 e90a658a58d4 Make sure that WeakValueDictionary[] raises KeyError instead of TypeError Fred Drake <fdrake@acm.org> parents: 17650 diff changeset	55 o = self.data[key]()
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	56 if o is None:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42084 diff changeset	57 raise KeyError(key)
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	58 else:
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	59 return o
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	60
45161 bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	61 def __delitem__(self, key):
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	62 del self.data[key]
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	63
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	64 def __len__(self):
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	65 return sum(wr() is not None for wr in self.data.values())
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	66
33197 7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	67 def __contains__(self, key):
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	68 try:
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	69 o = self.data[key]()
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	70 except KeyError:
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	71 return False
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	72 return o is not None
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	73
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	74 def __repr__(self):
16884 1ce751fa67d8 Change WeakDictionary to WeakValueDictionary in a couple more places. Fred Drake <fdrake@acm.org> parents: 16794 diff changeset	75 return "<WeakValueDictionary at %s>" % id(self)
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	76
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	77 def __setitem__(self, key, value):
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	78 self.data[key] = KeyedRef(value, self._remove, key)
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	79
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	80 def copy(self):
16884 1ce751fa67d8 Change WeakDictionary to WeakValueDictionary in a couple more places. Fred Drake <fdrake@acm.org> parents: 16794 diff changeset	81 new = WeakValueDictionary()
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	82 for key, wr in self.data.items():
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	83 o = wr()
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	84 if o is not None:
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	85 new[key] = o
16884 1ce751fa67d8 Change WeakDictionary to WeakValueDictionary in a couple more places. Fred Drake <fdrake@acm.org> parents: 16794 diff changeset	86 return new
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	87
17546 da5eab33147b WeakDictionary.update(): Fix calls to [].append() to only have one Fred Drake <fdrake@acm.org>* parents: 17386 diff changeset	88 def get(self, key, default=None):
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	89 try:
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	90 wr = self.data[key]
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	91 except KeyError:
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	92 return default
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	93 else:
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	94 o = wr()
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	95 if o is None:
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	96 # This should only happen
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	97 return default
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	98 else:
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	99 return o
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	100
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	101 def items(self):
16417 901b94656928 WeakDictionary.items(): Do not allow (key,ref) pairs to leak out for Fred Drake <fdrake@acm.org> parents: 16385 diff changeset	102 L = []
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	103 for key, wr in self.data.items():
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	104 o = wr()
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	105 if o is not None:
16417 901b94656928 WeakDictionary.items(): Do not allow (key,ref) pairs to leak out for Fred Drake <fdrake@acm.org> parents: 16385 diff changeset	106 L.append((key, o))
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	107 return L
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	108
49001 5b7845ef4efd Committing the patch in issue 2965, so that weakref dicts have a closer Barry Warsaw <barry@python.org> parents: 48739 diff changeset	109 def items(self):
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 39575 diff changeset	110 for wr in self.data.values():
33197 7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	111 value = wr()
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	112 if value is not None:
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	113 yield wr.key, value
17650 7a367ad43f35 Added iterator support to the WeakDictionary classes. Fred Drake <fdrake@acm.org>* parents: 17591 diff changeset	114
49001 5b7845ef4efd Committing the patch in issue 2965, so that weakref dicts have a closer Barry Warsaw <barry@python.org> parents: 48739 diff changeset	115 def keys(self):
40818 a84460e53160 Nailed test_weakref.py. Pfew, messy! Guido van Rossum <guido@python.org> parents: 40809 diff changeset	116 return iter(self.data.keys())
33197 7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	117
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	118 def __iter__(self):
40818 a84460e53160 Nailed test_weakref.py. Pfew, messy! Guido van Rossum <guido@python.org> parents: 40809 diff changeset	119 return iter(self.data.keys())
17650 7a367ad43f35 Added iterator support to the WeakDictionary classes. Fred Drake <fdrake@acm.org>* parents: 17591 diff changeset	120
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	121 def itervaluerefs(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	122 """Return an iterator that yields the weak references to the values.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	123
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	124 The references are not guaranteed to be 'live' at the time
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	125 they are used, so the result of calling the references needs
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	126 to be checked before being used. This can be used to avoid
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	127 creating references that will cause the garbage collector to
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	128 keep the values around longer than needed.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	129
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	130 """
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 39575 diff changeset	131 return self.data.values()
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	132
49001 5b7845ef4efd Committing the patch in issue 2965, so that weakref dicts have a closer Barry Warsaw <barry@python.org> parents: 48739 diff changeset	133 def values(self):
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 39575 diff changeset	134 for wr in self.data.values():
33197 7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	135 obj = wr()
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	136 if obj is not None:
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	137 yield obj
17650 7a367ad43f35 Added iterator support to the WeakDictionary classes. Fred Drake <fdrake@acm.org>* parents: 17591 diff changeset	138
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	139 def popitem(self):
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	140 while 1:
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	141 key, wr = self.data.popitem()
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	142 o = wr()
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	143 if o is not None:
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	144 return key, o
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	145
28240 ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	146 def pop(self, key, *args):
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	147 try:
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	148 o = self.data.pop(key)()
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	149 except KeyError:
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	150 if args:
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	151 return args[0]
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	152 raise
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	153 if o is None:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42084 diff changeset	154 raise KeyError(key)
28240 ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	155 else:
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	156 return o
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	157
32155 efb84ed7377d The default argument in dict.setdefault() defaults to None. Walter Dörwald <walter@livinglogic.de> parents: 31616 diff changeset	158 def setdefault(self, key, default=None):
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	159 try:
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	160 wr = self.data[key]
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	161 except KeyError:
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	162 self.data[key] = KeyedRef(default, self._remove, key)
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	163 return default
1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	164 else:
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	165 return wr()
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	166
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	167 def update(self, dict=None, **kwargs):
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	168 d = self.data
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	169 if dict is not None:
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	170 if not hasattr(dict, "items"):
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	171 dict = type({})(dict)
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	172 for key, o in dict.items():
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	173 d[key] = KeyedRef(o, self._remove, key)
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	174 if len(kwargs):
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	175 self.update(kwargs)
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	176
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	177 def valuerefs(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	178 """Return a list of weak references to the values.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	179
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	180 The references are not guaranteed to be 'live' at the time
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	181 they are used, so the result of calling the references needs
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	182 to be checked before being used. This can be used to avoid
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	183 creating references that will cause the garbage collector to
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	184 keep the values around longer than needed.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	185
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	186 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	187 return self.data.values()
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	188
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	189
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	190 class KeyedRef(ref):
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	191 """Specialized reference that includes a key corresponding to the value.
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	192
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	193 This is used in the WeakValueDictionary to avoid having to create
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	194 a function object for each key stored in the mapping. A shared
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	195 callback object can use the 'key' attribute of a KeyedRef instead
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	196 of getting a reference to the key from an enclosing scope.
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	197
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	198 """
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	199
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	200 __slots__ = "key",
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	201
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	202 def __new__(type, ob, callback, key):
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	203 self = ref.__new__(type, ob, callback)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	204 self.key = key
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	205 return self
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	206
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 32155 diff changeset	207 def __init__(self, ob, callback, key):
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 40949 diff changeset	208 super().__init__(ob, callback)
20155 bbb353d31e25 Clean up circular references in the WeakDictionary classes; this avoids Fred Drake <fdrake@acm.org>* parents: 19763 diff changeset	209
16385 1fb6672b20ef PEP 205, Weak References -- initial checkin. Fred Drake <fdrake@acm.org> parents: diff changeset	210
45161 bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	211 class WeakKeyDictionary(collections.MutableMapping):
17591 44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	212 """ Mapping class that references keys weakly.
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	213
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	214 Entries in the dictionary will be discarded when there is no
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	215 longer a strong reference to the key. This can be used to
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	216 associate additional data with an object owned by other parts of
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	217 an application without adding attributes to those objects. This
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	218 can be especially useful with objects that override attribute
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	219 accesses.
44a3ac59c268 WeakDictionary: Added docstrings to the classes. Fred Drake <fdrake@acm.org>* parents: 17546 diff changeset	220 """
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	221
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	222 def __init__(self, dict=None):
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	223 self.data = {}
20155 bbb353d31e25 Clean up circular references in the WeakDictionary classes; this avoids Fred Drake <fdrake@acm.org>* parents: 19763 diff changeset	224 def remove(k, selfref=ref(self)):
bbb353d31e25 Clean up circular references in the WeakDictionary classes; this avoids Fred Drake <fdrake@acm.org>* parents: 19763 diff changeset	225 self = selfref()
bbb353d31e25 Clean up circular references in the WeakDictionary classes; this avoids Fred Drake <fdrake@acm.org>* parents: 19763 diff changeset	226 if self is not None:
bbb353d31e25 Clean up circular references in the WeakDictionary classes; this avoids Fred Drake <fdrake@acm.org>* parents: 19763 diff changeset	227 del self.data[k]
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	228 self._remove = remove
23764 d58fb5445118 SF patch 564549 (Erik Andersén). Guido van Rossum <guido@python.org> parents: 23620 diff changeset	229 if dict is not None: self.update(dict)
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	230
19763 94d0f2eea047 Add __delitem__() support for WeakKeyDictionary. Fred Drake <fdrake@acm.org> parents: 18952 diff changeset	231 def __delitem__(self, key):
29257 dea38116c373 SF 742860: WeakKeyDictionary __delitem__ uses iterkeys Tim Peters <tim.peters@gmail.com> parents: 28240 diff changeset	232 del self.data[ref(key)]
19763 94d0f2eea047 Add __delitem__() support for WeakKeyDictionary. Fred Drake <fdrake@acm.org> parents: 18952 diff changeset	233
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	234 def __getitem__(self, key):
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	235 return self.data[ref(key)]
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	236
45161 bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	237 def __len__(self):
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	238 return len(self.data)
bdf7486893ba Decouple weakref containers from UserDict Raymond Hettinger <python@rcn.com> parents: 45159 diff changeset	239
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	240 def __repr__(self):
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	241 return "<WeakKeyDictionary at %s>" % id(self)
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	242
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	243 def __setitem__(self, key, value):
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	244 self.data[ref(key, self._remove)] = value
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	245
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	246 def copy(self):
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	247 new = WeakKeyDictionary()
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	248 for key, value in self.data.items():
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	249 o = key()
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	250 if o is not None:
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	251 new[o] = value
16884 1ce751fa67d8 Change WeakDictionary to WeakValueDictionary in a couple more places. Fred Drake <fdrake@acm.org> parents: 16794 diff changeset	252 return new
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	253
17546 da5eab33147b WeakDictionary.update(): Fix calls to [].append() to only have one Fred Drake <fdrake@acm.org>* parents: 17386 diff changeset	254 def get(self, key, default=None):
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	255 return self.data.get(ref(key),default)
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	256
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 20902 diff changeset	257 def __contains__(self, key):
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 20902 diff changeset	258 try:
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 20902 diff changeset	259 wr = ref(key)
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 20902 diff changeset	260 except TypeError:
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 20902 diff changeset	261 return 0
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 20902 diff changeset	262 return wr in self.data
24263 e6033254df21 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 23764 diff changeset	263
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	264 def items(self):
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 39575 diff changeset	265 for wr, value in self.data.items():
33197 7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	266 key = wr()
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	267 if key is not None:
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	268 yield key, value
17650 7a367ad43f35 Added iterator support to the WeakDictionary classes. Fred Drake <fdrake@acm.org>* parents: 17591 diff changeset	269
49001 5b7845ef4efd Committing the patch in issue 2965, so that weakref dicts have a closer Barry Warsaw <barry@python.org> parents: 48739 diff changeset	270 def keyrefs(self):
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	271 """Return an iterator that yields the weak references to the keys.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	272
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	273 The references are not guaranteed to be 'live' at the time
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	274 they are used, so the result of calling the references needs
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	275 to be checked before being used. This can be used to avoid
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	276 creating references that will cause the garbage collector to
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	277 keep the keys around longer than needed.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	278
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	279 """
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 39575 diff changeset	280 return self.data.keys()
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	281
49001 5b7845ef4efd Committing the patch in issue 2965, so that weakref dicts have a closer Barry Warsaw <barry@python.org> parents: 48739 diff changeset	282 def keys(self):
40809 f340cb045bf9 - PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone; Guido van Rossum <guido@python.org> parents: 39575 diff changeset	283 for wr in self.data.keys():
33197 7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	284 obj = wr()
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	285 if obj is not None:
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	286 yield obj
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	287
7da9201bc8b5 SF bug #1012315: weakref.WeakValueDictionary should override .has_key() Raymond Hettinger <python@rcn.com> parents: 33117 diff changeset	288 def __iter__(self):
40818 a84460e53160 Nailed test_weakref.py. Pfew, messy! Guido van Rossum <guido@python.org> parents: 40809 diff changeset	289 return iter(self.keys())
17650 7a367ad43f35 Added iterator support to the WeakDictionary classes. Fred Drake <fdrake@acm.org>* parents: 17591 diff changeset	290
49001 5b7845ef4efd Committing the patch in issue 2965, so that weakref dicts have a closer Barry Warsaw <barry@python.org> parents: 48739 diff changeset	291 def values(self):
40818 a84460e53160 Nailed test_weakref.py. Pfew, messy! Guido van Rossum <guido@python.org> parents: 40809 diff changeset	292 return iter(self.data.values())
17650 7a367ad43f35 Added iterator support to the WeakDictionary classes. Fred Drake <fdrake@acm.org>* parents: 17591 diff changeset	293
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	294 def keyrefs(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	295 """Return a list of weak references to the keys.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	296
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	297 The references are not guaranteed to be 'live' at the time
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	298 they are used, so the result of calling the references needs
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	299 to be checked before being used. This can be used to avoid
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	300 creating references that will cause the garbage collector to
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	301 keep the keys around longer than needed.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	302
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	303 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	304 return self.data.keys()
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 35018 diff changeset	305
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	306 def popitem(self):
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	307 while 1:
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	308 key, value = self.data.popitem()
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	309 o = key()
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	310 if o is not None:
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	311 return o, value
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	312
28240 ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	313 def pop(self, key, *args):
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	314 return self.data.pop(ref(key), *args)
ea70032a24b1 SF patch #667730: More DictMixin Raymond Hettinger <python@rcn.com> parents: 24263 diff changeset	315
32155 efb84ed7377d The default argument in dict.setdefault() defaults to None. Walter Dörwald <walter@livinglogic.de> parents: 31616 diff changeset	316 def setdefault(self, key, default=None):
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	317 return self.data.setdefault(ref(key, self._remove),default)
29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	318
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	319 def update(self, dict=None, **kwargs):
16794 29aa832b8787 Patch #403985: Add support for weak-keyed dictionaries Martin v. Löwis <martin@v.loewis.de> parents: 16424 diff changeset	320 d = self.data
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	321 if dict is not None:
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	322 if not hasattr(dict, "items"):
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	323 dict = type({})(dict)
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	324 for key, value in dict.items():
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	325 d[ref(key, self._remove)] = value
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	326 if len(kwargs):
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 29257 diff changeset	327 self.update(kwargs)

Mercurial > cpython-lru_cache-weakref

annotate Lib/weakref.py @ 51749:1408feec0084 3.0