[Python-3000-checkins] r65338 - in python/branches/py3k: Doc/library/stdtypes.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Jul 31 23:10:28 2008
New Revision: 65338

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

........
r65293 | benjamin.peterson | 2008-07-29 14:28:49 -0500 (Tue, 29 Jul 2008) | 1 line

the from __future__ import with_statement isn't needed in 2.6
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/library/stdtypes.rst

Modified: python/branches/py3k/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/py3k/Doc/library/stdtypes.rst (original)
+++ python/branches/py3k/Doc/library/stdtypes.rst Thu Jul 31 23:10:28 2008
@@ -2009,7 +2009,7 @@
the :keyword:`with` statement. For example, the following code will
automatically close *f* when the :keyword:`with` block is exited::

- from __future__ import with_statement
+ from __future__ import with_statement # This isn't required in Python 2.6

with open("hello.txt") as f:
for line in f: