summaryrefslogtreecommitdiffstats
path: root/Lib/collections
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2015-09-08 04:36:56 (GMT)
committerRaymond Hettinger <python@rcn.com>2015-09-08 04:36:56 (GMT)
commit3ada93fc864b3132af245412980f19d4fc07012f (patch)
tree8240e5be6436180a97f7d1a315adb833bd8a7f60 /Lib/collections
parent70b7539f9c61f4e41105dd49547dcecb4beb0f8b (diff)
parent8ba03cf33fca8769c5f35d5b42b3f937dceb8a60 (diff)
downloadcpython-3ada93fc864b3132af245412980f19d4fc07012f.zip
cpython-3ada93fc864b3132af245412980f19d4fc07012f.tar.gz
cpython-3ada93fc864b3132af245412980f19d4fc07012f.tar.bz2
merge
Diffstat (limited to 'Lib/collections')
-rw-r--r--Lib/collections/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 26e5d34..943cbca 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -892,9 +892,8 @@ class ChainMap(MutableMapping):
__copy__ = copy
def new_child(self, m=None): # like Django's Context.push()
- '''
- New ChainMap with a new map followed by all previous maps. If no
- map is provided, an empty dict is used.
+ '''New ChainMap with a new map followed by all previous maps.
+ If no map is provided, an empty dict is used.
'''
if m is None:
m = {}