summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-08 15:59:03 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-08 15:59:03 (GMT)
commit09974b4e9e8da3c9ba0469f4812e68cf9f700ffd (patch)
tree49e4a8ce2711ca52e92624042e1bf0d5a3d33b7f
parent5a2e2b8ff7a7a0d9b588f3eb79abffe9e21fbd52 (diff)
downloadcpython-09974b4e9e8da3c9ba0469f4812e68cf9f700ffd.zip
cpython-09974b4e9e8da3c9ba0469f4812e68cf9f700ffd.tar.gz
cpython-09974b4e9e8da3c9ba0469f4812e68cf9f700ffd.tar.bz2
Drop double newlines printed in some file iteration examples.
Patch by Steven Kryskalla.
-rw-r--r--Doc/tutorial/errors.rst4
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index 53be499..2b76c32 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -387,7 +387,7 @@ succeeded or failed. Look at the following example, which tries to open a file
and print its contents to the screen. ::
for line in open("myfile.txt"):
- print(line)
+ print(line, end="")
The problem with this code is that it leaves the file open for an indeterminate
amount of time after this part of the code has finished executing.
@@ -397,7 +397,7 @@ used in a way that ensures they are always cleaned up promptly and correctly. ::
with open("myfile.txt") as f:
for line in f:
- print(line)
+ print(line, end="")
After the statement is executed, the file *f* is always closed, even if a
problem was encountered while processing the lines. Objects which, like files,
diff --git a/Misc/ACKS b/Misc/ACKS
index 640287d..9e662f6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -592,6 +592,7 @@ Cédric Krier
Hannu Krosing
Andrej Krpic
Ivan Krstić
+Steven Kryskalla
Andrew Kuchling
Dave Kuhlman
Vladimir Kushnir