summaryrefslogtreecommitdiffstats
path: root/Lib/lib-tk
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 21:56:17 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 21:56:17 (GMT)
commita70f60acf3283a0f4684a5d22bc710004f2f1ed3 (patch)
tree57f32165f01a48392b9813966ed6f88f03a7a493 /Lib/lib-tk
parentce9cc4910481ec96a4024ffe36475e2c9feebfa1 (diff)
downloadcpython-a70f60acf3283a0f4684a5d22bc710004f2f1ed3.zip
cpython-a70f60acf3283a0f4684a5d22bc710004f2f1ed3.tar.gz
cpython-a70f60acf3283a0f4684a5d22bc710004f2f1ed3.tar.bz2
Issue #17047: remove doubled words found in 2.7 to 3.4 Lib/*,
as reported by Serhiy Storchaka and Matthew Barnett.
Diffstat (limited to 'Lib/lib-tk')
-rw-r--r--Lib/lib-tk/Tix.py44
-rw-r--r--Lib/lib-tk/turtle.py4
2 files changed, 25 insertions, 23 deletions
diff --git a/Lib/lib-tk/Tix.py b/Lib/lib-tk/Tix.py
index d474235..29d7572 100644
--- a/Lib/lib-tk/Tix.py
+++ b/Lib/lib-tk/Tix.py
@@ -1902,38 +1902,39 @@ class Grid(TixWidget, XView, YView):
self.tk.call(self, 'set', x, y, *args)
def size_column(self, index, **kw):
- """Queries or sets the size of the column given by
- INDEX. INDEX may be any non-negative
- integer that gives the position of a given column.
+ """Queries or sets the size of the column given by
+ INDEX. INDEX may be any non-negative
+ integer that gives the position of a given column.
INDEX can also be the string "default"; in this case, this command
queries or sets the default size of all columns.
- When no option-value pair is given, this command returns a tuple
- containing the current size setting of the given column. When
- option-value pairs are given, the corresponding options of the
+ When no option-value pair is given, this command returns a tuple
+ containing the current size setting of the given column. When
+ option-value pairs are given, the corresponding options of the
size setting of the given column are changed. Options may be one
- of the follwing:
+ of the follwing:
pad0 pixels
Specifies the paddings to the left of a column.
pad1 pixels
- Specifies the paddings to the right of a column.
+ Specifies the paddings to the right of a column.
size val
- Specifies the width of a column .
- Val may be: "auto" -- the width of the column is set the
- the widest cell in the column; a valid Tk screen distance
- unit; or a real number following by the word chars
+ Specifies the width of a column. Val may be:
+ "auto" -- the width of the column is set to the
+ width of the widest cell in the column;
+ a valid Tk screen distance unit;
+ or a real number following by the word chars
(e.g. 3.4chars) that sets the width of the column to the
given number of characters."""
return self.tk.split(self.tk.call(self._w, 'size', 'column', index,
*self._options({}, kw)))
def size_row(self, index, **kw):
- """Queries or sets the size of the row given by
- INDEX. INDEX may be any non-negative
- integer that gives the position of a given row .
+ """Queries or sets the size of the row given by
+ INDEX. INDEX may be any non-negative
+ integer that gives the position of a given row .
INDEX can also be the string "default"; in this case, this command
queries or sets the default size of all rows.
- When no option-value pair is given, this command returns a list con-
- taining the current size setting of the given row . When option-value
+ When no option-value pair is given, this command returns a list con-
+ taining the current size setting of the given row . When option-value
pairs are given, the corresponding options of the size setting of the
given row are changed. Options may be one of the follwing:
pad0 pixels
@@ -1941,10 +1942,11 @@ class Grid(TixWidget, XView, YView):
pad1 pixels
Specifies the paddings to the bottom of a row.
size val
- Specifies the height of a row.
- Val may be: "auto" -- the height of the row is set the
- the highest cell in the row; a valid Tk screen distance
- unit; or a real number following by the word chars
+ Specifies the height of a row. Val may be:
+ "auto" -- the height of the row is set to the
+ height of the highest cell in the row;
+ a valid Tk screen distance unit;
+ or a real number following by the word chars
(e.g. 3.4chars) that sets the height of the row to the
given number of characters."""
return self.tk.split(self.tk.call(
diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index aa4fe847..2954051 100644
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -811,8 +811,8 @@ class TurtleScreenBase(object):
class Terminator (Exception):
"""Will be raised in TurtleScreen.update, if _RUNNING becomes False.
- Thus stops execution of turtle graphics script. Main purpose: use in
- in the Demo-Viewer turtle.Demo.py.
+ This stops execution of a turtle graphics script.
+ Main purpose: use in the Demo-Viewer turtle.Demo.py.
"""
pass