summaryrefslogtreecommitdiffstats
path: root/Doc/library/collections.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 09:27:06 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 09:27:06 (GMT)
commit794e9bf1fe5bd0000f90c1502b16c96eb68a59af (patch)
tree0fe2b5742d9d244ffac97dc7b4928ee29eefe370 /Doc/library/collections.rst
parent9e67d801bdef7c43e6704200770fb9cf2040dc11 (diff)
parent525d355984e1afa342aa72fc7867a56eea937a61 (diff)
downloadcpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.zip
cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.gz
cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/library/collections.rst')
-rw-r--r--Doc/library/collections.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 1614758..75053a5 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -109,7 +109,7 @@ The class can be used to simulate nested scopes and is useful in templating.
writing to any mapping in the chain.
* Django's `Context class
- <http://code.djangoproject.com/browser/django/trunk/django/template/context.py>`_
+ <https://github.com/django/django/blob/master/django/template/context.py>`_
for templating is a read-only chain of mappings. It also features
pushing and popping of contexts similar to the
:meth:`~collections.ChainMap.new_child` method and the