[Python-checkins] cpython (merge 3.2 -> default): merge heads (#13887)

[benjamin.peterson]

http://hg.python.org/cpython/rev/26612ad451ad
changeset:   74657:26612ad451ad
parent:      74655:d35a25a25cb3
parent:      74656:089a086252fc
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Jan 27 09:14:29 2012 -0500
summary:
  merge heads (#13887)

files:
  Doc/library/collections.rst |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -595,6 +595,11 @@
       :class:`dict` class when the requested key is not found; whatever it
       returns or raises is then returned or raised by :meth:`__getitem__`.
 
+      Note that :meth:`__missing__` is *not* called for any operations besides
+      :meth:`__getitem__`. This means that :meth:`get` will, like normal
+      dictionaries, return ``None`` as a default rather than using
+      :attr:`default_factory`.
+
 
    :class:`defaultdict` objects support the following instance variable:
 

-- 
Repository URL: http://hg.python.org/cpython