[Python-checkins] cpython (3.2): Issue #17047: remove doubled words found in 2.7 to 3.4 Lib/*,

Mon Mar 11 23:00:11 CET 2013

http://hg.python.org/cpython/rev/3f5f961262ec
changeset: 82618:3f5f961262ec
branch: 3.2
parent: 82614:e9ba9f21a828
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Mar 11 17:57:08 2013 -0400
summary:
 Issue #17047: remove doubled words found in 2.7 to 3.4 Lib/*,
as reported by Serhiy Storchaka and Matthew Barnett.
files:
 Lib/_pyio.py | 2 +-
 Lib/concurrent/futures/_base.py | 2 +-
 Lib/distutils/command/install.py | 4 +-
 Lib/distutils/tests/test_install.py | 2 +-
 Lib/ftplib.py | 4 +-
 Lib/idlelib/extend.txt | 4 +-
 Lib/idlelib/rpc.py | 2 +-
 Lib/lib2to3/pgen2/grammar.py | 4 +-
 Lib/msilib/__init__.py | 2 +-
 Lib/test/test_descrtut.py | 2 +-
 Lib/test/test_socket.py | 2 +-
 Lib/tkinter/tix.py | 44 ++++++++--------
 Lib/turtle.py | 4 +-
 13 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/Lib/_pyio.py b/Lib/_pyio.py
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -298,7 +298,7 @@
 def seek(self, pos, whence=0):
 """Change stream position.
 
- Change the stream position to byte offset offset. offset is
+ Change the stream position to byte offset pos. Argument pos is
 interpreted relative to the position indicated by whence. Values
 for whence are ints:
 
diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -519,7 +519,7 @@
 """Returns a iterator equivalent to map(fn, iter).
 
 Args:
- fn: A callable that will take take as many arguments as there are
+ fn: A callable that will take as many arguments as there are
 passed iterables.
 timeout: The maximum number of seconds to wait. If None, then there
 is no limit on the wait time.
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -278,8 +278,8 @@
 
 if self.user and (self.prefix or self.exec_prefix or self.home or
 self.install_base or self.install_platbase):
- raise DistutilsOptionError("can't combine user with with prefix/"
- "exec_prefix/home or install_(plat)base")
+ raise DistutilsOptionError("can't combine user with prefix, "
+ "exec_prefix/home, or install_(plat)base")
 
 # Next, stuff that's wrong (or dubious) only on certain platforms.
 if os.name != "posix":
diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
--- a/Lib/distutils/tests/test_install.py
+++ b/Lib/distutils/tests/test_install.py
@@ -165,7 +165,7 @@
 cmd.home = 'home'
 self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
- # can't combine user with with prefix/exec_prefix/home or
+ # can't combine user with prefix/exec_prefix/home or
 # install_(plat)base
 cmd.prefix = None
 cmd.user = 'user'
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -464,7 +464,7 @@
 blocksize: The maximum data size to read from fp and send over
 the connection at once. [default: 8192]
 callback: An optional single parameter callable that is called on
- on each block of data after it is sent. [default: None]
+ each block of data after it is sent. [default: None]
 rest: Passed to transfercmd(). [default: None]
 
 Returns:
@@ -486,7 +486,7 @@
 cmd: A STOR command.
 fp: A file-like object with a readline() method.
 callback: An optional single parameter callable that is called on
- on each line after it is sent. [default: None]
+ each line after it is sent. [default: None]
 
 Returns:
 The response code.
diff --git a/Lib/idlelib/extend.txt b/Lib/idlelib/extend.txt
--- a/Lib/idlelib/extend.txt
+++ b/Lib/idlelib/extend.txt
@@ -54,7 +54,7 @@
 implement. (They are also not required to create keybindings, but in that
 case there must be empty bindings in cofig-extensions.def)
 
-Here is a complete example example:
+Here is a complete example:
 
 class ZoomHeight:
 
@@ -72,7 +72,7 @@
 "...Do what you want here..."
 
 The final piece of the puzzle is the file "config-extensions.def", which is
-used to to configure the loading of extensions and to establish key (or, more
+used to configure the loading of extensions and to establish key (or, more
 generally, event) bindings to the virtual events defined in the extensions.
 
 See the comments at the top of config-extensions.def for information. It's
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -2,7 +2,7 @@
 
 For security reasons, GvR requested that Idle's Python execution server process
 connect to the Idle process, which listens for the connection. Since Idle has
-has only one client per server, this was not a limitation.
+only one client per server, this was not a limitation.
 
 +---------------------------------+ +-------------+
 | socketserver.BaseRequestHandler | | SocketIO |
diff --git a/Lib/lib2to3/pgen2/grammar.py b/Lib/lib2to3/pgen2/grammar.py
--- a/Lib/lib2to3/pgen2/grammar.py
+++ b/Lib/lib2to3/pgen2/grammar.py
@@ -20,7 +20,7 @@
 
 
 class Grammar(object):
- """Pgen parsing tables tables conversion class.
+ """Pgen parsing tables conversion class.
 
 Once initialized, this class supplies the grammar tables for the
 parsing engine implemented by parse.py. The parsing engine
@@ -45,7 +45,7 @@
 these two are each other's inverse.
 
 states -- a list of DFAs, where each DFA is a list of
- states, each state is is a list of arcs, and each
+ states, each state is a list of arcs, and each
 arc is a (i, j) pair where i is a label and j is
 a state number. The DFA number is the index into
 this list. (This name is slightly confusing.)
diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py
--- a/Lib/msilib/__init__.py
+++ b/Lib/msilib/__init__.py
@@ -325,7 +325,7 @@
 
 def add_file(self, file, src=None, version=None, language=None):
 """Add a file to the current component of the directory, starting a new one
- one if there is no current component. By default, the file name in the source
+ if there is no current component. By default, the file name in the source
 and the file table will be identical. If the src file is specified, it is
 interpreted relative to the current directory. Optionally, a version and a
 language can be specified for the entry in the File table."""
diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py
--- a/Lib/test/test_descrtut.py
+++ b/Lib/test/test_descrtut.py
@@ -316,7 +316,7 @@
 ... return self.__set(inst, value)
 
 Now let's define a class with an attribute x defined by a pair of methods,
-getx() and and setx():
+getx() and setx():
 
 >>> class C(object):
 ...
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -442,7 +442,7 @@
 # Try same call with optional protocol omitted
 port2 = socket.getservbyname(service)
 eq(port, port2)
- # Try udp, but don't barf it it doesn't exist
+ # Try udp, but don't barf if it doesn't exist
 try:
 udpport = socket.getservbyname(service, 'udp')
 except socket.error:
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -1901,38 +1901,39 @@
 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
@@ -1940,10 +1941,11 @@
 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/turtle.py b/Lib/turtle.py
--- a/Lib/turtle.py
+++ b/Lib/turtle.py
@@ -857,8 +857,8 @@
 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
 
-- 
Repository URL: http://hg.python.org/cpython
