merge

3ada93fc · Raymond Hettinger · 70b7539f · 8ba03cf3 · 3ada93fc
Commit 3ada93fc authored Sep 08, 2015 by Raymond Hettinger
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

Lib/collections/__init__.py Lib/collections/__init__.py +2 -3

No files found.
--- 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 = {}