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

[raymond.hettinger]

http://hg.python.org/cpython/rev/37f4805199fa
changeset:   90835:37f4805199fa
parent:      90832:3985104e2290
parent:      90834:ebeade01bd8e
user:        Raymond Hettinger <python at rcn.com>
date:        Sun May 25 18:06:27 2014 -0700
summary:
  merge

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


diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
--- a/Doc/library/contextlib.rst
+++ b/Doc/library/contextlib.rst
@@ -371,7 +371,7 @@
     with ExitStack() as stack:
         for resource in resources:
             stack.enter_context(resource)
-        if need_special resource:
+        if need_special_resource():
             special = acquire_special_resource()
             stack.callback(release_special_resource, special)
         # Perform operations that use the acquired resources

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