[Python-checkins] cpython (merge 3.4 -> 3.5): merge
raymond.hettinger
python-checkins at python.org
Tue Sep 8 06:37:26 CEST 2015
https://hg.python.org/cpython/rev/c07664203a19
changeset: 97770:c07664203a19
branch: 3.5
parent: 97767:309c0331726b
parent: 97769:fc71979b80a5
user: Raymond Hettinger <python at rcn.com>
date: Tue Sep 08 00:36:56 2015 -0400
summary:
merge
files:
Lib/collections/__init__.py | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -892,9 +892,8 @@
__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 = {}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list