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'
........

diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 55905fef5224c83a428e44c043c968443ac48f85..0f368adffb8f76fa7370445dc9676156f050cada 100644 (file)
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -708,7 +708,10 @@ Settings for measurement
       >>> 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 @@ Window control
    :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::

diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index 90dadf98954b639cfaa4db0969f745504b031e1c..23e407d3fbe03d2ede7b8ba13f1a36693efb783d 100644 (file)
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -1495,7 +1495,10 @@ class TNavigator(object):
         >>> 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