summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-07-23 16:58:35 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-07-23 16:58:35 (GMT)
commit1270bb9d14507577c15a5f5c039681f04a3bc4ea (patch)
treee837bddedb25b48d334a3b6402ce19d6eafe0a56
parent446aa638d59268c3aa877b8544059709d69c9c9b (diff)
downloadcpython-1270bb9d14507577c15a5f5c039681f04a3bc4ea.zip
cpython-1270bb9d14507577c15a5f5c039681f04a3bc4ea.tar.gz
cpython-1270bb9d14507577c15a5f5c039681f04a3bc4ea.tar.bz2
Merged revisions 83105 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83105 | ezio.melotti | 2010-07-23 19:55:21 +0300 (Fri, 23 Jul 2010) | 9 lines Merged revisions 83103 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83103 | ezio.melotti | 2010-07-23 19:48:22 +0300 (Fri, 23 Jul 2010) | 1 line #9359: fix typo. Thanks to Piotr Kasprzyk for the patch. ........ ................
-rw-r--r--Lib/idlelib/PyShell.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index c1b98a0..440052f 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -539,7 +539,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
This method is called from the subprocess, and by returning from this
method we allow the subprocess to unblock. After a bit the shell
requests the subprocess to open the remote stack viewer which returns a
- static object looking at the last exceptiopn. It is queried through
+ static object looking at the last exception. It is queried through
the RPC mechanism.
"""