Changeset 391 for python/trunk/Doc/library/turtle.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/turtle.rst (modified) (9 diffs)

python/trunk/Doc/library/turtle.rst

@@ -19 +19 @@
 Seymour Papert in 1966.
 
-Imagine a robotic turtle starting at (0, 0) in the x-y plane.  Give it the
+Imagine a robotic turtle starting at (0, 0) in the x-y plane.  After an ``import turtle``, give it the
 command ``turtle.forward(15)``, and it moves (on-screen!) 15 pixels in the
 direction it is facing, drawing a line as it moves.  Give it the command
-``turtle.left(25)``, and it rotates in-place 25 degrees clockwise.
+``turtle.right(25)``, and it rotates in-place 25 degrees clockwise.
 
 By combining together these and similar commands, intricate shapes and pictures
@@ -158 +158 @@
    | :func:`onrelease`
    | :func:`ondrag`
+   | :func:`mainloop` | :func:`done`
 
 Special Turtle methods
@@ -709 +710 @@
       >>> turtle.heading()
       90.0
-      >>> turtle.degrees(400.0)  # angle measurement in gon
+
+      Change angle measurement unit to grad (also known as gon,
+      grade, or gradian and equals 1/100-th of the right angle.)
+      >>> turtle.degrees(400.0)
       >>> turtle.heading()
       100.0
@@ -876 +880 @@
        >>> turtle.pencolor(tup)
        >>> turtle.pencolor()
-       (0.20000000000000001, 0.80000000000000004, 0.5490196078431373)
+       (0.2, 0.8, 0.5490196078431373)
        >>> colormode(255)
        >>> turtle.pencolor()
@@ -1289 +1293 @@
 
 
+.. function:: mainloop()
+              done()
+
+   Starts event loop - calling Tkinter's mainloop function. Must be the last
+   statement in a turtle graphics program.
+
+      >>> turtle.mainloop()
+
+
 Special Turtle methods
 ----------------------
@@ -1455 +1468 @@
    :param args: a color string or three numbers in the range 0..colormode or a
                 3-tuple of such numbers
+
 
    Set or return background color of the TurtleScreen.
@@ -1836 +1850 @@
 
    Set the size and position of the main window.  Default values of arguments
-   are stored in the configuration dicionary and can be changed via a
+   are stored in the configuration dictionary and can be changed via a
    :file:`turtle.cfg` file.
 
@@ -1902 +1916 @@
 
 
-.. class:: ScrolledCavas(master)
+.. class:: ScrolledCanvas(master)
 
    :param master: some Tkinter widget to contain the ScrolledCanvas, i.e.
@@ -2160 +2174 @@
 The demoscripts are:
 
+.. tabularcolumns:: |l|L|L|
+
 +----------------+------------------------------+-----------------------+
 | Name           | Description                  | Features              |
-+----------------+------------------------------+-----------------------+
++================+==============================+=======================+
 | bytedesign     | complex classical            | :func:`tracer`, delay,|
 |                | turtlegraphics pattern       | :func:`update`        |
 +----------------+------------------------------+-----------------------+
-| chaos          | graphs verhust dynamics,     | world coordinates     |
-|                | proves that you must not     |                       |
-|                | trust computers' computations|                       |
+| chaos          | graphs Verhulst dynamics,    | world coordinates     |
+|                | shows that computer's        |                       |
+|                | computations can generate    |                       |
+|                | results sometimes against the|                       |
+|                | common sense expectations    |                       |
 +----------------+------------------------------+-----------------------+
 | clock          | analog clock showing time    | turtles as clock's    |