From 4d39f6e09a5c0a0e09eb51d678bacd1adaa3f2ca Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Sun, 2 May 2010 09:54:35 +0000 Subject: Merged revisions 80698 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80698 | ronald.oussoren | 2010-05-02 11:48:21 +0200 (Sun, 02 May 2010) | 3 lines For for issue #7192: with this patch webbrowser.get("firefox") works on OSX ........ --- Lib/webbrowser.py | 28 +++++++++++++++++++++++++++- Misc/NEWS | 3 +++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 72ba1ac..d25c2e6 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -600,9 +600,35 @@ if sys.platform == 'darwin': rc = osapipe.close() return not rc + class MacOSXOSAScript(BaseBrowser): + def __init__(self, name): + self._name = name + + def open(self, url, new=0, autoraise=True): + if self._name == 'default': + script = 'open location "%s"' % url.replace('"', '%22') # opens in default browser + else: + script = ''' + tell application "%s" + activate + open location "%s" + end + '''%(self._name, url.replace('"', '%22')) + + osapipe = os.popen("osascript", "w") + if osapipe is None: + return False + + osapipe.write(script) + rc = osapipe.close() + return not rc + + # Don't clear _tryorder or _browsers since OS X can use above Unix support # (but we prefer using the OS X specific stuff) - register("MacOSX", None, MacOSX('default'), -1) + register("safari", None, MacOSXOSAScript('safari'), -1) + register("firefox", None, MacOSXOSAScript('firefox'), -1) + register("MacOSX", None, MacOSXOSAScript('default'), -1) # diff --git a/Misc/NEWS b/Misc/NEWS index f935480..e30315a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -345,6 +345,9 @@ C-API Library ------- +- Issue #7192: webbrowser.get("firefox") now wors on Mac OS X, as does + webbrowser.get("safari"). + - Issue #8464: tarfile no longer creates files with execute permissions set when mode="w|" is used. -- cgit v0.12