summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-16 09:38:59 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-16 09:38:59 (GMT)
commitb88ed1549e76fadf161227d15cc307f0e8b94c59 (patch)
tree7fea10f9a15064480554f093da39f361df463c61 /Lib/idlelib
parentc8a03349d174379f051ab93d02a2918a15269e00 (diff)
parent3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (diff)
downloadcpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.zip
cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.gz
cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.bz2
#11565: Merge with 3.2.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/FormatParagraph.py2
-rw-r--r--Lib/idlelib/extend.txt2
-rw-r--r--Lib/idlelib/macosxSupport.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/Lib/idlelib/FormatParagraph.py b/Lib/idlelib/FormatParagraph.py
index 02f96d4..6a5f9b5 100644
--- a/Lib/idlelib/FormatParagraph.py
+++ b/Lib/idlelib/FormatParagraph.py
@@ -54,7 +54,7 @@ class FormatParagraph:
# If the block ends in a \n, we dont want the comment
# prefix inserted after it. (Im not sure it makes sense to
# reformat a comment block that isnt made of complete
- # lines, but whatever!) Can't think of a clean soltution,
+ # lines, but whatever!) Can't think of a clean solution,
# so we hack away
block_suffix = ""
if not newdata[-1]:
diff --git a/Lib/idlelib/extend.txt b/Lib/idlelib/extend.txt
index f5fb3e0..165e044 100644
--- a/Lib/idlelib/extend.txt
+++ b/Lib/idlelib/extend.txt
@@ -18,7 +18,7 @@ window.
An IDLE extension class is instantiated with a single argument,
`editwin', an EditorWindow instance. The extension cannot assume much
-about this argument, but it is guarateed to have the following instance
+about this argument, but it is guaranteed to have the following instance
variables:
text a Text instance (a widget)
diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py
index 30dd1e1..f93ef11 100644
--- a/Lib/idlelib/macosxSupport.py
+++ b/Lib/idlelib/macosxSupport.py
@@ -53,8 +53,8 @@ def tkVersionWarning(root):
def addOpenEventSupport(root, flist):
"""
- This ensures that the application will respont to open AppleEvents, which
- makes is feaseable to use IDLE as the default application for python files.
+ This ensures that the application will respond to open AppleEvents, which
+ makes is feasible to use IDLE as the default application for python files.
"""
def doOpenFile(*args):
for fn in args: