From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 23 Jul 2010 16:55:21 +0000 (+0000)
Subject: Merged revisions 83103 via svnmerge from
X-Git-Tag: v2.7.1rc1~566
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c569cfebcebd3d3c8cf77e6c8971a19c78ff7261;p=thirdparty%2FPython%2Fcpython.git

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 5491a750c939..acae420d9110 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -552,7 +552,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.
 
         """