#3503: fix print statements in 3k doc.

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index c21e531ed417bdefc9e48175c48094b826e8c77c..488ba91dd048b08184f669965bdda8df2768c561 100644 (file)
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -434,7 +434,7 @@ function like this::
    def cheeseshop(kind, *arguments, **keywords):
        print("-- Do you have any", kind, '?')
        print("-- I'm sorry, we're all out of", kind)
-       for arg in arguments: print arg
+       for arg in arguments: print(arg)
        print('-'*40)
        keys = sorted(keywords.keys())
        for kw in keys: print(kw, ':', keywords[kw])

diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index bf1c79fa1243837ef14a33fb2f416a00c5978b1c..5f8d04ea0c1c1485708efa2f8b985fe3472518f3 100644 (file)
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -208,7 +208,7 @@ to the right argument, and returns the string resulting from this formatting
 operation. For example::
 
    >>> import math
-   >>> print 'The value of PI is approximately %5.3f.' % math.pi
+   >>> print('The value of PI is approximately %5.3f.' % math.pi)
    The value of PI is approximately 3.142.
 
 Since :meth:`str.format` is quite new, a lot of Python code still uses the ``%``

diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 66c5a7c5d0107efdaa3487733ed73440156e1995..bc81d7a1dae973174d0be63eb38943332a637732 100644 (file)
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -599,16 +599,12 @@ This example introduces several new features.
      >>> print('The value of i is', i)
      The value of i is 65536
 
-   The keyword end can be used to avoid the newline after the output::
+  The keyword *end* can be used to avoid the newline after the output, or end
+  the output with a different string::
 
      >>> a, b = 0, 1
      >>> while b < 1000:
-     ...     print(b, ' ', end='')
+     ...     print(b, end=' ')
      ...     a, b = b, a+b
      ... 
-     >>> print()
      1 1 2 3 5 8 13 21 34 55 89 144 233 377 610 987
-
- Note that nothing appeared after the loop ended, until we printed
- a newline.
-

diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index 68e02581cf8285a17d1122988f3e02da462148a4..1b3cbc556e1cc94dae63e8337597ea119b11ff4b 100644 (file)
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -32,6 +32,7 @@ called :file:`fibo.py` in the current directory with the following contents::
        while b < n:
            print(b, end=' ')
            a, b = b, a+b
+       print()
 
    def fib2(n): # return Fibonacci series up to n
        result = []