diff options
| -rw-r--r-- | Lib/_pyio.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/command/install.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_install.py | 2 | ||||
| -rw-r--r-- | Lib/ftplib.py | 4 | ||||
| -rw-r--r-- | Lib/idlelib/extend.txt | 4 | ||||
| -rw-r--r-- | Lib/idlelib/rpc.py | 2 | ||||
| -rw-r--r-- | Lib/lib-tk/Tix.py | 44 | ||||
| -rw-r--r-- | Lib/lib-tk/turtle.py | 4 | ||||
| -rw-r--r-- | Lib/lib2to3/pgen2/grammar.py | 4 | ||||
| -rw-r--r-- | Lib/msilib/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_descrtut.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 2 |
12 files changed, 39 insertions, 37 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py index ac7832e1bd..0986ed23e1 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -298,7 +298,7 @@ class IOBase: 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: diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index f1f3bd5c6f..b9f1c6c566 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -265,8 +265,8 @@ class install (Command): 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 index f17baa1e50..2996161797 100644 --- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -166,7 +166,7 @@ class InstallTestCase(support.TempdirManager, 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 index 53b5f44c52..a62218b333 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -454,7 +454,7 @@ class FTP: 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: @@ -477,7 +477,7 @@ class FTP: 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 index 165e044b5d..c9cb2e8297 100644 --- a/Lib/idlelib/extend.txt +++ b/Lib/idlelib/extend.txt @@ -54,7 +54,7 @@ Extensions are not required to define menu entries for all the events they 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 @@ class ZoomHeight: "...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 index 13950589a0..0614cf0147 100644 --- 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/lib-tk/Tix.py b/Lib/lib-tk/Tix.py index d474235e85..29d7572477 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 aa4fe8475b..29540518b7 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 diff --git a/Lib/lib2to3/pgen2/grammar.py b/Lib/lib2to3/pgen2/grammar.py index 0483424dc4..1aa5c43278 100644 --- a/Lib/lib2to3/pgen2/grammar.py +++ b/Lib/lib2to3/pgen2/grammar.py @@ -20,7 +20,7 @@ from . import token, tokenize 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 @@ class Grammar(object): 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 index 63f392359b..907a739d56 100644 --- a/Lib/msilib/__init__.py +++ b/Lib/msilib/__init__.py @@ -326,7 +326,7 @@ class Directory: 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 index 157b9f4fe9..33ff0c8fb7 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -329,7 +329,7 @@ Attributes defined by get/set methods ... 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 index 05d044e37f..111e55394a 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -415,7 +415,7 @@ class GeneralModuleTests(unittest.TestCase): # 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: |