[Python-checkins] r83110 - in python/branches/release26-maint: Lib/idlelib/PyShell.py

[ezio.melotti]

Author: ezio.melotti
Date: Fri Jul 23 18:58:35 2010
New Revision: 83110

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/idlelib/PyShell.py

Modified: python/branches/release26-maint/Lib/idlelib/PyShell.py
==============================================================================
--- python/branches/release26-maint/Lib/idlelib/PyShell.py	(original)
+++ python/branches/release26-maint/Lib/idlelib/PyShell.py	Fri Jul 23 18:58:35 2010
@@ -539,7 +539,7 @@
         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.
 
         """