summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-15 04:03:08 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-15 04:03:08 (GMT)
commit373089239b26e7445aa44a3501c7056cfa4c3728 (patch)
tree5f2f35ff686dfa64092b06b730ed9090f6492896 /Lib/idlelib
parentdeaa678952dd437cb8cf9f697325705ad0855029 (diff)
parent4969f709cc07088a40574c05724d83cddc8fafc7 (diff)
downloadcpython-373089239b26e7445aa44a3501c7056cfa4c3728.zip
cpython-373089239b26e7445aa44a3501c7056cfa4c3728.tar.gz
cpython-373089239b26e7445aa44a3501c7056cfa4c3728.tar.bz2
#11515: Merge with 3.2.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/EditorWindow.py4
-rw-r--r--Lib/idlelib/HISTORY.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 6a1e325..a37cb1d 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -104,8 +104,8 @@ class EditorWindow(object):
self.top = top = WindowList.ListedToplevel(root, menu=self.menubar)
if flist:
self.tkinter_vars = flist.vars
- #self.top.instance_dict makes flist.inversedict avalable to
- #configDialog.py so it can access all EditorWindow instaces
+ #self.top.instance_dict makes flist.inversedict available to
+ #configDialog.py so it can access all EditorWindow instances
self.top.instance_dict = flist.inversedict
else:
self.tkinter_vars = {} # keys: Tkinter event names
diff --git a/Lib/idlelib/HISTORY.txt b/Lib/idlelib/HISTORY.txt
index c0faaad..01d73ed 100644
--- a/Lib/idlelib/HISTORY.txt
+++ b/Lib/idlelib/HISTORY.txt
@@ -13,7 +13,7 @@ What's New in IDLEfork 0.8.1?
- New tarball released as a result of the 'revitalisation' of the IDLEfork
project.
-- This release requires python 2.1 or better. Compatability with earlier
+- This release requires python 2.1 or better. Compatibility with earlier
versions of python (especially ancient ones like 1.5x) is no longer a
priority in IDLEfork development.