[Python-checkins] r86184 - in python/branches/release27-maint: Doc/library/turtle.rst Lib/lib-tk/turtle.py

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Fri Nov  5 02:56:24 2010
New Revision: 86184

Log:
Merged revisions 85930 via svnmerge from 
http://svn.python.org/projects/python/branches/py3k

........
  r85930 | alexander.belopolsky | 2010-10-29 13:16:49 -0400 (Fri, 29 Oct 2010) | 1 line
  
  Issue 7061: Explained 'gon'
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/library/turtle.rst
   python/branches/release27-maint/Lib/lib-tk/turtle.py

Modified: python/branches/release27-maint/Doc/library/turtle.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/turtle.rst	(original)
+++ python/branches/release27-maint/Doc/library/turtle.rst	Fri Nov  5 02:56:24 2010
@@ -708,7 +708,10 @@
       >>> turtle.left(90)
       >>> 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
       >>> turtle.degrees(360)
@@ -1455,6 +1458,7 @@
    :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.
 
    .. doctest::

Modified: python/branches/release27-maint/Lib/lib-tk/turtle.py
==============================================================================
--- python/branches/release27-maint/Lib/lib-tk/turtle.py	(original)
+++ python/branches/release27-maint/Lib/lib-tk/turtle.py	Fri Nov  5 02:56:24 2010
@@ -1495,7 +1495,10 @@
         >>> turtle.left(90)
         >>> turtle.heading()
         90
-        >>> 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