[Python-checkins] cpython (2.7): Drop double newlines printed in some file iteration examples.

[andrew.svetlov]

http://hg.python.org/cpython/rev/29627bd5b333
changeset:   80758:29627bd5b333
branch:      2.7
parent:      80747:57f5771de27d
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Dec 08 18:01:27 2012 +0200
summary:
  Drop double newlines printed in some file iteration examples.

Patch by Steven Kryskalla.

files:
  Doc/library/stdtypes.rst |  6 +++---
  Doc/tutorial/classes.rst |  2 +-
  Doc/tutorial/errors.rst  |  4 ++--
  Misc/ACKS                |  1 +
  4 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2330,7 +2330,7 @@
 
       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 @@
       f = open("hello.txt")
       try:
           for line in f:
-              print line
+              print line,
       finally:
           f.close()
 
@@ -2392,7 +2392,7 @@
 
    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
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -688,7 +688,7 @@
    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
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -397,7 +397,7 @@
 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 @@
 
    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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -546,6 +546,7 @@
 Hannu Krosing
 Andrej Krpic
 Ivan Krstić
+Steven Kryskalla
 Andrew Kuchling
 Ralf W. Grosse-Kunstleve
 Dave Kuhlman

-- 
Repository URL: http://hg.python.org/cpython