From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sat, 8 Dec 2012 16:01:27 +0000 (+0200)
Subject: Drop double newlines printed in some file iteration examples.
X-Git-Tag: v2.7.5~109^2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd5279ea247e46d4bf88d1b1b306060e479e227f;p=python

Drop double newlines printed in some file iteration examples.

Patch by Steven Kryskalla.
---

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index b51110e504..2761410f0a 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2330,7 +2330,7 @@ Files have the following methods:
 
       with open("hello.txt") as f:
           for line in f:
-              print line
+              print line,
 
    In older versions of Python, you would have needed to do this to get the same
    effect::
@@ -2338,7 +2338,7 @@ Files have the following methods:
       f = open("hello.txt")
       try:
           for line in f:
-              print line
+              print line,
       finally:
           f.close()
 
@@ -2392,7 +2392,7 @@ Files have the following methods:
 
    A file object is its own iterator, for example ``iter(f)`` returns *f* (unless
    *f* is closed).  When a file is used as an iterator, typically in a
-   :keyword:`for` loop (for example, ``for line in f: print line``), the
+   :keyword:`for` loop (for example, ``for line in f: print line.strip()``), the
    :meth:`~file.next` method is called repeatedly.  This method returns the next input
    line, or raises :exc:`StopIteration` when EOF is hit when the file is open for
    reading (behavior is undefined when the file is open for writing).  In order to
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 95a3a832d6..2cc3610c22 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -688,7 +688,7 @@ using a :keyword:`for` statement::
    for char in "123":
        print char
    for line in open("myfile.txt"):
-       print line
+       print line,
 
 This style of access is clear, concise, and convenient.  The use of iterators
 pervades and unifies Python.  Behind the scenes, the :keyword:`for` statement
diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index 5fc1eebabd..6d14cb3480 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -397,7 +397,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,
 
 The problem with this code is that it leaves the file open for an indeterminate
 amount of time after the code has finished executing. This is not an issue in
@@ -407,7 +407,7 @@ ensures they are always cleaned up promptly and correctly. ::
 
    with open("myfile.txt") as f:
        for line in f:
-           print line
+           print line,
 
 After the statement is executed, the file *f* is always closed, even if a
 problem was encountered while processing the lines. Other objects which provide
diff --git a/Misc/ACKS b/Misc/ACKS
index 5d9f44b83e..0a7c8bd2e2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -546,6 +546,7 @@ Cédric Krier
 Hannu Krosing
 Andrej Krpic
 Ivan Krstić
+Steven Kryskalla
 Andrew Kuchling
 Ralf W. Grosse-Kunstleve
 Dave Kuhlman