summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-04-25 10:20:56 (GMT)
committerGeorg Brandl <georg@python.org>2010-04-25 10:20:56 (GMT)
commit3aba37af52a67a6d56644d2d4fecb272211f6e5c (patch)
tree6908a8cbe9e09ed11809cf04a6690fce742f5f37 /Doc/howto
parentc2203f92ff05840873d68ae6369a302c7db4948e (diff)
downloadcpython-3aba37af52a67a6d56644d2d4fecb272211f6e5c.zip
cpython-3aba37af52a67a6d56644d2d4fecb272211f6e5c.tar.gz
cpython-3aba37af52a67a6d56644d2d4fecb272211f6e5c.tar.bz2
Merged revisions 80463 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r80463 | georg.brandl | 2010-04-25 12:19:53 +0200 (So, 25 Apr 2010) | 17 lines Merged revisions 80150,80460-80461 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80150 | r.david.murray | 2010-04-17 17:45:38 +0200 (Sa, 17 Apr 2010) | 2 lines Update link to Apple Publication Style guide. ........ r80460 | georg.brandl | 2010-04-25 12:16:00 +0200 (So, 25 Apr 2010) | 1 line #8528: fix typo. ........ 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. ........ ................
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/doanddont.rst5
1 files changed, 1 insertions, 4 deletions
diff --git a/Doc/howto/doanddont.rst b/Doc/howto/doanddont.rst
index 989ae9f..5fe3015 100644
--- a/Doc/howto/doanddont.rst
+++ b/Doc/howto/doanddont.rst
@@ -199,11 +199,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