From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 8 Nov 2020 12:06:17 +0000 (-0800)
Subject: bpo-41754: Ignore NotADirectoryError in invocation of xdg-settings (GH-23075) (GH... 
X-Git-Tag: v3.8.7rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db087f6d9ef9a7c873cd883ee120126fc0ca0c72;p=thirdparty%2FPython%2Fcpython.git

bpo-41754: Ignore NotADirectoryError in invocation of xdg-settings (GH-23075) (GH-23198)

It is not clear why this can happen, but several users have mentioned
getting this exception on macOS.
(cherry picked from commit 23831a7a90956e38b7d70304bb6afe30d37936de)

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
---

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index cea91308ce1b..6023c1e13841 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, PermissionError) :
+            except (FileNotFoundError, subprocess.CalledProcessError, PermissionError, NotADirectoryError) :
                 pass
             else:
                 global _os_preferred_browser
diff --git a/Misc/NEWS.d/next/Library/2020-11-01-15-07-20.bpo-41754.DraSZh.rst b/Misc/NEWS.d/next/Library/2020-11-01-15-07-20.bpo-41754.DraSZh.rst
new file mode 100644
index 000000000000..181c2d9650a1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-11-01-15-07-20.bpo-41754.DraSZh.rst
@@ -0,0 +1 @@
+webbrowser: Ignore *NotADirectoryError* when calling ``xdg-settings``.