[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3

[barry.warsaw]

http://hg.python.org/cpython/rev/1bed56c3d010
changeset:   83705:1bed56c3d010
parent:      83703:eafff38a56cc
parent:      83704:3b935ac07f65
user:        Barry Warsaw <barry at python.org>
date:        Fri May 10 11:36:23 2013 -0400
summary:
  Merge 3.3

files:
  Doc/library/contextlib.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
--- a/Doc/library/contextlib.rst
+++ b/Doc/library/contextlib.rst
@@ -279,11 +279,12 @@
 
          with ExitStack() as stack:
              files = [stack.enter_context(open(fname)) for fname in filenames]
-             close_files = stack.pop_all().close()
+             # Hold onto the close method, but don't call it yet.
+             close_files = stack.pop_all().close
              # If opening any file fails, all previously opened files will be
              # closed automatically. If all files are opened successfully,
              # they will remain open even after the with statement ends.
-             # close_files() can then be invoked explicitly to close them all
+             # close_files() can then be invoked explicitly to close them all.
 
    .. method:: close()
 

-- 
Repository URL: http://hg.python.org/cpython