summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-04-03 07:16:46 (GMT)
committerGeorg Brandl <georg@python.org>2012-04-03 07:16:46 (GMT)
commit283b96b6bd974179b7f7f93f1c4631c3cc20c96d (patch)
tree899d03eb3a70b39c8b5c40e4f9d66558a7eca06d /Doc
parent39f0037735562462efeebb11f319bd8b71a32c46 (diff)
downloadcpython-283b96b6bd974179b7f7f93f1c4631c3cc20c96d.zip
cpython-283b96b6bd974179b7f7f93f1c4631c3cc20c96d.tar.gz
cpython-283b96b6bd974179b7f7f93f1c4631c3cc20c96d.tar.bz2
Move ChainMap versionadded to be less ambiguous.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/collections.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 5298dbc..71c27ed 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -41,6 +41,8 @@ Python's general purpose built-in containers, :class:`dict`, :class:`list`,
:class:`ChainMap` objects
-------------------------
+.. versionadded:: 3.3
+
A :class:`ChainMap` class is provided for quickly linking a number of mappings
so they can be treated as a single unit. It is often much faster than creating
a new dictionary and running multiple :meth:`~dict.update` calls.
@@ -91,8 +93,6 @@ The class can be used to simulate nested scopes and is useful in templating.
The use-cases also parallel those for the builtin :func:`super` function.
A reference to ``d.parents`` is equivalent to: ``ChainMap(*d.maps[1:])``.
- .. versionadded:: 3.3
-
Example of simulating Python's internal lookup chain::
import builtins