Commitb2cd48a

committed

webbrowser: lookup default webbrowser on mac

ensures web browser is launched on mac, even for URLs that are not http[s].

1 parent0142236 commitb2cd48aCopy full SHA for b2cd48a

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 26 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,32 @@ def open(self, url, new=0, autoraise=True):`
`597`	`597`	`sys.audit("webbrowser.open",url)`
`598`	`598`	`url=url.replace('"','%22')`
`599`	`599`	`ifself.name=='default':`
`600`		`-script=f'open location "{url}"'# opens in default browser`
	`600`	`+proto,_sep,_rest=url.partition(":")`
	`601`	`+if_sepandproto.lower()in {"http","https"}:`
	`602`	`+# default web URL, don't need to lookup browser`
	`603`	`+script=f'open location "{url}"'`
	`604`	`+else:`
	`605`	`+# if not a web URL, need to lookup default browser to ensure a browser is launched`
	`606`	`+# this should always work, but is overkill to lookup http handler`
	`607`	`+# before launching http`
	`608`	`+script=f"""`
	`609`	`+ use framework "AppKit"`
	`610`	`+ use AppleScript version "2.4"`
	`611`	`+ use scripting additions`
	`612`	`+`
	`613`	`+ property NSWorkspace : a reference to current application's NSWorkspace`
	`614`	`+ property NSURL : a reference to current application's NSURL`
	`615`	`+`
	`616`	`+ set http_url to NSURL's URLWithString:"https://python.org"`
	`617`	`+ set browser_url to (NSWorkspace's sharedWorkspace)'s ¬`
	`618`	`+ URLForApplicationToOpenURL:http_url`
	`619`	`+ set app_path to browser_url's relativePath as text -- NSURL to absolute path '/Applications/Safari.app'`
	`620`	`+`
	`621`	`+ tell application app_path`
	`622`	`+ activate`
	`623`	`+ open location "{url}"`
	`624`	`+ end tell`
	`625`	`+ """`
`601`	`626`	`else:`
`602`	`627`	`script=f'''`
`603`	`628`	`tell application "{self.name}"`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Ensure web browser is launched by {func}`webbrowser.open` on macOS, even for
	`2`	+``file://`` URLs.

Comments

(0)