summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 21:58:27 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 21:58:27 (GMT)
commit98472b839674a78b0cbb09f50a61f70019591a4a (patch)
tree7644852bcc4bcb5833aec9b1dfd8a419f60d0446 /Lib/idlelib
parent09b7503bc999b2c65c9d61465cd19758ff97c0c4 (diff)
parentc30b7b16ea03ad094917615940cd1a9ef53c4904 (diff)
downloadcpython-98472b839674a78b0cbb09f50a61f70019591a4a.zip
cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.gz
cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.bz2
Merge 3.2, 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/idlelib')
-rw-r--r--Lib/idlelib/extend.txt4
-rw-r--r--Lib/idlelib/rpc.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/extend.txt b/Lib/idlelib/extend.txt
index 165e044..c9cb2e8 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 77cb3ac..a0eb1b3 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 |