From: Georg Brandl <georg@python.org>
Date: Sun, 25 Apr 2010 10:18:59 +0000 (+0000)
Subject: Merged revisions 80461 via svnmerge from
X-Git-Tag: v2.6.6rc1~405
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a33971a3959f6c1a655f03830dc4b84e9cdc6d7f;p=python

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.
........
---

diff --git a/Doc/howto/doanddont.rst b/Doc/howto/doanddont.rst
index f0c688bf2d..05d8df9db9 100644
--- a/Doc/howto/doanddont.rst
+++ b/Doc/howto/doanddont.rst
@@ -232,11 +232,8 @@ file would not be closed when an exception is raised until the handler finishes,
 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