summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2015-09-08 04:37:17 (GMT)
committerRaymond Hettinger <python@rcn.com>2015-09-08 04:37:17 (GMT)
commit09dadb5430369c78d9706c89bea35b74e68c835b (patch)
treeb30212b18697ca5d38831474d619eb20c15e9cec
parentfcec42c3a87f71686ed95e9176b2a441c3398f2e (diff)
parent3ada93fc864b3132af245412980f19d4fc07012f (diff)
downloadcpython-09dadb5430369c78d9706c89bea35b74e68c835b.zip
cpython-09dadb5430369c78d9706c89bea35b74e68c835b.tar.gz
cpython-09dadb5430369c78d9706c89bea35b74e68c835b.tar.bz2
merge
-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 = {}