[Python-checkins] r80462 - in python/branches/release26-maint: Doc/howto/doanddont.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Apr 25 12:18:59 2010
New Revision: 80462

Log:
Merged revisions 80461 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80461 | georg.brandl | 2010-04-25 12:17:27 +0200 (So, 25 Apr 2010) | 1 line
  
  #8522: use with statement instead of try-finally for file handling.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/howto/doanddont.rst

Modified: python/branches/release26-maint/Doc/howto/doanddont.rst
==============================================================================
--- python/branches/release26-maint/Doc/howto/doanddont.rst	(original)
+++ python/branches/release26-maint/Doc/howto/doanddont.rst	Sun Apr 25 12:18:59 2010
@@ -232,11 +232,8 @@
 and perhaps not at all in non-C implementations (e.g., Jython). ::
 
    def get_status(file):
-       fp = open(file)
-       try:
+       with open(file) as fp:
            return fp.readline()
-       finally:
-           fp.close()
 
 
 Using the Batteries