mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 04:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Checking sys.platform for substring 'win' was breaking IDLE docs on Mac

Browse source 
(darwin). Also, Mac Safari browser requires full file:// URIs.  SF 900580

M EditorWindow.py
M NEWS.txt
M configHelpSourceEdit.py
M idlever.py
This commit is contained in:
Kurt B. Kaiser 2004-07-15 04:54:57 +00:00
parent 69dc1c8f6a
commit 8aa23927e3
4 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/idlelib/EditorWindow.py
View file

@ -60,11 +60,10 @@ class EditorWindow:
basepath = '/usr/share/doc/' # standard location
dochome = os.path.join(basepath, pyver,
'Doc', 'index.html')
elif sys.platform.count('win') or sys.platform.count('nt'):
elif sys.platform[:3] == 'win':
chmfile = os.path.join(sys.prefix, "Python%d%d.chm" % sys.version_info[:2])
if os.path.isfile(chmfile):
dochome = chmfile
print "dochome =", dochome
dochome = os.path.normpath(dochome)
if os.path.isfile(dochome):
EditorWindow.help_url = dochome
@ -314,20 +313,11 @@ class EditorWindow:
textView.TextViewer(self.top,'Help',fn)
def python_docs(self, event=None):
if sys.platform.count('win') or sys.platform.count('nt'):
if sys.platform[:3] == 'win':
os.startfile(self.help_url)
return "break"
else:
webbrowser.open(self.help_url)
return "break"
def display_docs(self, url):
if not (url.startswith('www') or url.startswith('http')):
url = os.path.normpath(url)
if sys.platform.count('win') or sys.platform.count('nt'):
os.startfile(url)
else:
webbrowser.open(url)
return "break"
def cut(self,event):
self.text.event_generate("<<Cut>>")
@ -578,7 +568,12 @@ class EditorWindow:
def __extra_help_callback(self, helpfile):
"Create a callback with the helpfile value frozen at definition time"
def display_extra_help(helpfile=helpfile):
self.display_docs(helpfile)
if not (helpfile.startswith('www') or helpfile.startswith('http')):
url = os.path.normpath(helpfile)
if sys.platform[:3] == 'win':
os.startfile(helpfile)
else:
webbrowser.open(helpfile)
return display_extra_help
def update_recent_files_list(self, new_file=None):