From 528bc134a376e222ff7f6e9e843340aeab605801 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 23 Nov 2009 16:39:46 +0000 Subject: [PATCH] Merged revisions 76460 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76460 | mark.dickinson | 2009-11-23 16:39:05 +0000 (Mon, 23 Nov 2009) | 2 lines Issue #7369: Fibonacci series should start at 0 in tutorial example. ........ --- Doc/tutorial/controlflow.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index 55462d9cf3f..a9247cd0b9a 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -194,13 +194,13 @@ boundary:: >>> def fib(n): # write Fibonacci series up to n ... """Print a Fibonacci series up to n.""" ... a, b = 0, 1 - ... while b < n: - ... print b, + ... while a < n: + ... print a, ... a, b = b, a+b ... >>> # Now call the function we just defined: ... fib(2000) - 1 1 2 3 5 8 13 21 34 55 89 144 233 377 610 987 1597 + 0 1 1 2 3 5 8 13 21 34 55 89 144 233 377 610 987 1597 .. index:: single: documentation strings @@ -244,7 +244,7 @@ mechanism:: >>> f = fib >>> f(100) - 1 1 2 3 5 8 13 21 34 55 89 + 0 1 1 2 3 5 8 13 21 34 55 89 Coming from other languages, you might object that ``fib`` is not a function but a procedure since it doesn't return a value. In fact, even functions without a @@ -264,14 +264,14 @@ Fibonacci series, instead of printing it:: ... """Return a list containing the Fibonacci series up to n.""" ... result = [] ... a, b = 0, 1 - ... while b < n: - ... result.append(b) # see below + ... while a < n: + ... result.append(a) # see below ... a, b = b, a+b ... return result ... >>> f100 = fib2(100) # call it >>> f100 # write the result - [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89] + [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89] This example, as usual, demonstrates some new Python features: @@ -279,7 +279,7 @@ This example, as usual, demonstrates some new Python features: :keyword:`return` without an expression argument returns ``None``. Falling off the end of a function also returns ``None``. -* The statement ``result.append(b)`` calls a *method* of the list object +* The statement ``result.append(a)`` calls a *method* of the list object ``result``. A method is a function that 'belongs' to an object and is named ``obj.methodname``, where ``obj`` is some object (this may be an expression), and ``methodname`` is the name of a method that is defined by the object's type. @@ -288,7 +288,7 @@ This example, as usual, demonstrates some new Python features: object types and methods, using *classes*, see :ref:`tut-classes`) The method :meth:`append` shown in the example is defined for list objects; it adds a new element at the end of the list. In this example it is equivalent to - ``result = result + [b]``, but more efficient. + ``result = result + [a]``, but more efficient. .. _tut-defining: