summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-11-05 01:56:24 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-11-05 01:56:24 (GMT)
commitab016d21a6a71bd061e0ff4a3722350950f19644 (patch)
treedcf75db1745f0bdcb35f5b7cc3f7671650e9f7a0
parent77d9695a7e25a9bcb2552577cc2d8a245cd10775 (diff)
downloadcpython-ab016d21a6a71bd061e0ff4a3722350950f19644.zip
cpython-ab016d21a6a71bd061e0ff4a3722350950f19644.tar.gz
cpython-ab016d21a6a71bd061e0ff4a3722350950f19644.tar.bz2
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' ........
-rw-r--r--Doc/library/turtle.rst6
-rw-r--r--Lib/lib-tk/turtle.py5
2 files changed, 9 insertions, 2 deletions
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 55905fe..0f368ad 100644
--- 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 90dadf9..23e407d 100644
--- 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