Merge branch 'main' of https://github.com/python/cpython into main

Lib/test/test_webbrowser.py

@@ -95,6 +95,31 @@ class ChromeCommandTest(CommandTestMixin, unittest.TestCase):
                    arguments=[URL])
 
 
+class EdgeCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Edge
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['--new-window'],
+                   arguments=[URL])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=[],
+                   arguments=[URL])
+
+
 class MozillaCommandTest(CommandTestMixin, unittest.TestCase):
 
     browser_class = webbrowser.Mozilla

Lib/webbrowser.py

@@ -400,6 +400,16 @@ class Konqueror(BaseBrowser):
         return ok
 
 
+class Edge(UnixBrowser):
+    "Launcher class for Microsoft Edge browser."
+
+    remote_args = ['%action', '%s']
+    remote_action = ""
+    remote_action_newwin = "--new-window"
+    remote_action_newtab = ""
+    background = True
+
+
 #
 # Platform support for Unix
 #
@@ -456,6 +466,10 @@ def register_X_browsers():
         register("opera", None, Opera("opera"))
 
 
+    if shutil.which("microsoft-edge"):
+        register("microsoft-edge", None, Edge("microsoft-edge"))
+
+
 def register_standard_browsers():
     global _tryorder
     _tryorder = []
@@ -487,6 +501,8 @@ def register_standard_browsers():
                         "opera", edge64, edge32):
             if shutil.which(browser):
                 register(browser, None, BackgroundBrowser(browser))
+        if shutil.which("MicrosoftEdge.exe"):
+            register("microsoft-edge", None, Edge("MicrosoftEdge.exe"))
     else:
         # Prefer X browsers if present
         if os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"):

Misc/NEWS.d/next/Library/2021-12-03-23-00-56.bpo-44844.tvg2VY.rst

@@ -0,0 +1 @@
+Enables :mod:`webbrowser` to detect and launch Microsoft Edge browser.