]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue 6285: catch missing IDLE help file. Backport from 3.2.
authorTerry Reedy <tjreedy@udel.edu>
Sat, 1 Jan 2011 02:32:46 +0000 (02:32 +0000)
committerTerry Reedy <tjreedy@udel.edu>
Sat, 1 Jan 2011 02:32:46 +0000 (02:32 +0000)
Lib/idlelib/EditorWindow.py

index c6a4001b222db3e85b9682ec6d73c2e38270b86f..9e7573d644e31721cfecfb5d4092ac7ba5b416a3 100644 (file)
@@ -452,7 +452,11 @@ class EditorWindow(object):
 
     def python_docs(self, event=None):
         if sys.platform[:3] == 'win':
-            os.startfile(self.help_url)
+            try:
+                os.startfile(self.help_url)
+            except WindowsError as why:
+                tkMessageBox.showerror(title='Document Start Failure',
+                    message=str(why), parent=self.text)
         else:
             webbrowser.open(self.help_url)
         return "break"
@@ -747,9 +751,13 @@ class EditorWindow(object):
         "Create a callback with the helpfile value frozen at definition time"
         def display_extra_help(helpfile=helpfile):
             if not helpfile.startswith(('www', 'http')):
-                url = os.path.normpath(helpfile)
+                helpfile = os.path.normpath(helpfile)
             if sys.platform[:3] == 'win':
-                os.startfile(helpfile)
+                try:
+                    os.startfile(helpfile)
+                except WindowsError as why:
+                    tkMessageBox.showerror(title='Document Start Failure',
+                        message=str(why), parent=self.text)
             else:
                 webbrowser.open(helpfile)
         return display_extra_help