mirror of https://github.com/python/cpython
Issue 6285: catch missing IDLE help file. Backport from 3.2.
This commit is contained in:
parent
c0b3544268
commit
247327a27e
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue