summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-06-24 05:58:27 -0700
committerGitHub <noreply@github.com>2020-06-24 14:58:27 +0200
commitadf8708c44945bfa68db8b02c6a1f560f05a5151 (patch)
tree2206a1331f6a3355f58fc4a8350a468b8c0b699e
parent0029099decbf0272cea837b029662bee1ee3e4d4 (diff)
downloadcpython-git-adf8708c44945bfa68db8b02c6a1f560f05a5151.tar.gz
bpo-41005: Fixed perrmission error (GH-20936) (GH-21052)
* fixed issue 41005: webbrowser fails when xdg-settings cannot be executed Co-authored-by: KrishnaSai2020 <krishnasai.chivukula@gmal.com> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> (cherry picked from commit 9e27bc0c1efc7478872f98729f87886e9333548f) Co-authored-by: Krishna Chivukula <63070026+KrishnaSai2020@users.noreply.github.com> Co-authored-by: Krishna Chivukula <63070026+KrishnaSai2020@users.noreply.github.com>
-rwxr-xr-xLib/webbrowser.py2
-rw-r--r--Misc/NEWS.d/next/macOS/2020-06-17-13-45-15.bpo-41005.zZegdV.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 3dcf66b659..53e0efc967 100755
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -550,7 +550,7 @@ def register_standard_browsers():
cmd = "xdg-settings get default-web-browser".split()
raw_result = subprocess.check_output(cmd, stderr=subprocess.DEVNULL)
result = raw_result.decode().strip()
- except (FileNotFoundError, subprocess.CalledProcessError):
+ except (FileNotFoundError, subprocess.CalledProcessError, PermissionError) :
pass
else:
global _os_preferred_browser
diff --git a/Misc/NEWS.d/next/macOS/2020-06-17-13-45-15.bpo-41005.zZegdV.rst b/Misc/NEWS.d/next/macOS/2020-06-17-13-45-15.bpo-41005.zZegdV.rst
new file mode 100644
index 0000000000..3b5f3f23a1
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2020-06-17-13-45-15.bpo-41005.zZegdV.rst
@@ -0,0 +1 @@
+fixed an XDG settings issue not allowing macos to open browser in webbrowser.py \ No newline at end of file