]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-102690: Use Edge as fallback in webbrowser instead of IE (#102691)
authorJamoo721 <81095953+Jamoo721@users.noreply.github.com>
Thu, 16 Mar 2023 02:52:11 +0000 (13:52 +1100)
committerGitHub <noreply@github.com>
Thu, 16 Mar 2023 02:52:11 +0000 (22:52 -0400)
Lib/webbrowser.py
Misc/NEWS.d/next/Windows/2023-03-14-10-52-43.gh-issue-102690.sbXtqk.rst [new file with mode: 0644]

index 44974d433b46966d98cd3cc9d5dcb22d60b0feed..a56ff33dbbdc699e43ddbde681a4be489e65dc5a 100755 (executable)
@@ -542,11 +542,15 @@ def register_standard_browsers():
         # First try to use the default Windows browser
         register("windows-default", WindowsDefault)
 
-        # Detect some common Windows browsers, fallback to IE
-        iexplore = os.path.join(os.environ.get("PROGRAMFILES", "C:\\Program Files"),
-                                "Internet Explorer\\IEXPLORE.EXE")
+        # Detect some common Windows browsers, fallback to Microsoft Edge
+        # location in 64-bit Windows
+        edge64 = os.path.join(os.environ.get("PROGRAMFILES(x86)", "C:\\Program Files (x86)"),
+                              "Microsoft\\Edge\\Application\\msedge.exe")
+        # location in 32-bit Windows
+        edge32 = os.path.join(os.environ.get("PROGRAMFILES", "C:\\Program Files"),
+                              "Microsoft\\Edge\\Application\\msedge.exe")
         for browser in ("firefox", "firebird", "seamonkey", "mozilla",
-                        "netscape", "opera", iexplore):
+                        "opera", edge64, edge32):
             if shutil.which(browser):
                 register(browser, None, BackgroundBrowser(browser))
     else:
diff --git a/Misc/NEWS.d/next/Windows/2023-03-14-10-52-43.gh-issue-102690.sbXtqk.rst b/Misc/NEWS.d/next/Windows/2023-03-14-10-52-43.gh-issue-102690.sbXtqk.rst
new file mode 100644 (file)
index 0000000..5669ebb
--- /dev/null
@@ -0,0 +1 @@
+Update :mod:`webbrowser` to fall back to Microsoft Edge instead of Internet Explorer.