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.
  ........
................

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index c1b98a059f4a84fe1f65a81fcbe3d0eaefe5faee..440052f28ea580c26f662b2b7f646f8319007832 100644 (file)
--- 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.
 
         """