summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-12-10 23:39:45 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-12-10 23:39:45 (GMT)
commite6b2b78a7d2715e5b645825924c575ceff3d4205 (patch)
tree98ff251874393ff38cea4ba0123fd2cbbce091a4 /Doc/reference
parent927131e050950e7345b2f3e19e8a57c2a328385b (diff)
parentb67f6e27e11264876e185cacd8ebabbf41c27fb0 (diff)
downloadcpython-e6b2b78a7d2715e5b645825924c575ceff3d4205.zip
cpython-e6b2b78a7d2715e5b645825924c575ceff3d4205.tar.gz
cpython-e6b2b78a7d2715e5b645825924c575ceff3d4205.tar.bz2
Merge 3.4
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/datamodel.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 3f3c32b..7a6ed0a 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1904,6 +1904,12 @@ through the container; for mappings, :meth:`__iter__` should be the same as
indexes to allow proper detection of the end of the sequence.
+.. method:: object.__missing__(self, key)
+
+ Called by :class:`dict`\ .\ :meth:`__getitem__` to implement ``self[key]`` for dict subclasses
+ when key is not in the dictionary.
+
+
.. method:: object.__setitem__(self, key, value)
Called to implement assignment to ``self[key]``. Same note as for