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

[terry.reedy]

https://hg.python.org/cpython/rev/91e35a24d419
changeset:   92933:91e35a24d419
parent:      92931:8e3387f566f6
parent:      92932:b81443d9c64a
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Oct 10 16:00:39 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/library/contextlib.rst |  4 ++--
  1 files changed, 2 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
@@ -568,10 +568,10 @@
             self.name = name
 
         def __enter__(self):
-            logging.info('Entering: {}'.format(name))
+            logging.info('Entering: {}'.format(self.name))
 
         def __exit__(self, exc_type, exc, exc_tb):
-            logging.info('Exiting: {}'.format(name))
+            logging.info('Exiting: {}'.format(self.name))
 
 Instances of this class can be used as both a context manager::
 

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