diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-05-02 09:48:21 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-05-02 09:48:21 (GMT) |
commit | 4ef1c7e7efbd8827b9f97c73d0eb9a31604e83f2 (patch) | |
tree | ab2d85a0f59fc1f96d5129f32a718e3fe00c8ae2 /Lib | |
parent | 328284adcfe8fb9f9811a251ef00438800223344 (diff) | |
download | cpython-4ef1c7e7efbd8827b9f97c73d0eb9a31604e83f2.zip cpython-4ef1c7e7efbd8827b9f97c73d0eb9a31604e83f2.tar.gz cpython-4ef1c7e7efbd8827b9f97c73d0eb9a31604e83f2.tar.bz2 |
For for issue #7192: with this patch webbrowser.get("firefox")
works on OSX
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/webbrowser.py | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 01922f4..45e0b54 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -599,9 +599,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("MacOSX", None, MacOSXOSAScript('default'), -1) + register("safari", None, MacOSXOSAScript('safari'), -1) + register("firefox", None, MacOSXOSAScript('firefox'), -1) # |