summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Doc/library/webbrowser.rst17
-rw-r--r--Doc/whatsnew/3.12.rst4
-rw-r--r--Lib/test/test_webbrowser.py31
-rwxr-xr-xLib/webbrowser.py91
-rw-r--r--Misc/NEWS.d/next/Library/2023-03-21-15-17-07.gh-issue-102871.U9mchn.rst3
5 files changed, 29 insertions, 117 deletions
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
index 734b632..61db804 100644
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -115,13 +115,7 @@ for the controller classes, all defined in this module.
+------------------------+-----------------------------------------+-------+
| ``'firefox'`` | :class:`Mozilla('mozilla')` | |
+------------------------+-----------------------------------------+-------+
-| ``'netscape'`` | :class:`Mozilla('netscape')` | |
-+------------------------+-----------------------------------------+-------+
-| ``'galeon'`` | :class:`Galeon('galeon')` | |
-+------------------------+-----------------------------------------+-------+
-| ``'epiphany'`` | :class:`Galeon('epiphany')` | |
-+------------------------+-----------------------------------------+-------+
-| ``'skipstone'`` | :class:`BackgroundBrowser('skipstone')` | |
+| ``'epiphany'`` | :class:`Epiphany('epiphany')` | |
+------------------------+-----------------------------------------+-------+
| ``'kfmclient'`` | :class:`Konqueror()` | \(1) |
+------------------------+-----------------------------------------+-------+
@@ -129,12 +123,8 @@ for the controller classes, all defined in this module.
+------------------------+-----------------------------------------+-------+
| ``'kfm'`` | :class:`Konqueror()` | \(1) |
+------------------------+-----------------------------------------+-------+
-| ``'mosaic'`` | :class:`BackgroundBrowser('mosaic')` | |
-+------------------------+-----------------------------------------+-------+
| ``'opera'`` | :class:`Opera()` | |
+------------------------+-----------------------------------------+-------+
-| ``'grail'`` | :class:`Grail()` | |
-+------------------------+-----------------------------------------+-------+
| ``'links'`` | :class:`GenericBrowser('links')` | |
+------------------------+-----------------------------------------+-------+
| ``'elinks'`` | :class:`Elinks('elinks')` | |
@@ -176,6 +166,11 @@ Notes:
.. versionadded:: 3.3
Support for Chrome/Chromium has been added.
+.. versionchanged:: 3.12
+ Support for several obsolete browsers has been removed.
+ Removed browsers include Grail, Mosaic, Netscape, Galeon,
+ Skipstone, Iceape, and Firefox versions 35 and below.
+
.. deprecated-removed:: 3.11 3.13
:class:`MacOSX` is deprecated, use :class:`MacOSXOSAScript` instead.
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 00a51ab..bd9be53 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -777,6 +777,10 @@ Removed
*context* parameter instead.
(Contributed by Victor Stinner in :gh:`94172`.)
+* Remove support for obsolete browsers from :mod:`webbrowser`.
+ Removed browsers include: Grail, Mosaic, Netscape, Galeon, Skipstone,
+ Iceape, Firebird, and Firefox versions 35 and below (:gh:`102871`).
+
Porting to Python 3.12
======================
diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
index 9d608d6..147a113 100644
--- a/Lib/test/test_webbrowser.py
+++ b/Lib/test/test_webbrowser.py
@@ -11,7 +11,7 @@ from test.support import os_helper
if not support.has_subprocess_support:
raise unittest.SkipTest("test webserver requires subprocess")
-URL = 'http://www.example.com'
+URL = 'https://www.example.com'
CMD_NAME = 'test'
@@ -120,34 +120,9 @@ class MozillaCommandTest(CommandTestMixin, unittest.TestCase):
arguments=['-new-tab', URL])
-class NetscapeCommandTest(CommandTestMixin, unittest.TestCase):
+class EpiphanyCommandTest(CommandTestMixin, unittest.TestCase):
- browser_class = webbrowser.Netscape
-
- def test_open(self):
- self._test('open',
- options=['-raise', '-remote'],
- arguments=['openURL({})'.format(URL)])
-
- def test_open_with_autoraise_false(self):
- self._test('open', kw=dict(autoraise=False),
- options=['-noraise', '-remote'],
- arguments=['openURL({})'.format(URL)])
-
- def test_open_new(self):
- self._test('open_new',
- options=['-raise', '-remote'],
- arguments=['openURL({},new-window)'.format(URL)])
-
- def test_open_new_tab(self):
- self._test('open_new_tab',
- options=['-raise', '-remote'],
- arguments=['openURL({},new-tab)'.format(URL)])
-
-
-class GaleonCommandTest(CommandTestMixin, unittest.TestCase):
-
- browser_class = webbrowser.Galeon
+ browser_class = webbrowser.Epiphany
def test_open(self):
self._test('open',
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 4336597..d98c599 100755
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -292,19 +292,8 @@ class Mozilla(UnixBrowser):
background = True
-class Netscape(UnixBrowser):
- """Launcher class for Netscape browser."""
-
- raise_opts = ["-noraise", "-raise"]
- remote_args = ['-remote', 'openURL(%s%action)']
- remote_action = ""
- remote_action_newwin = ",new-window"
- remote_action_newtab = ",new-tab"
- background = True
-
-
-class Galeon(UnixBrowser):
- """Launcher class for Galeon/Epiphany browsers."""
+class Epiphany(UnixBrowser):
+ """Launcher class for Epiphany browser."""
raise_opts = ["-noraise", ""]
remote_args = ['%action', '%s']
@@ -402,44 +391,6 @@ class Konqueror(BaseBrowser):
return (p.poll() is None)
-class Grail(BaseBrowser):
- # There should be a way to maintain a connection to Grail, but the
- # Grail remote control protocol doesn't really allow that at this
- # point. It probably never will!
- def _find_grail_rc(self):
- import glob
- import pwd
- import socket
- import tempfile
- tempdir = os.path.join(tempfile.gettempdir(),
- ".grail-unix")
- user = pwd.getpwuid(os.getuid())[0]
- filename = os.path.join(glob.escape(tempdir), glob.escape(user) + "-*")
- maybes = glob.glob(filename)
- if not maybes:
- return None
- s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
- for fn in maybes:
- # need to PING each one until we find one that's live
- try:
- s.connect(fn)
- except OSError:
- # no good; attempt to clean it out, but don't fail:
- try:
- os.unlink(fn)
- except OSError:
- pass
- else:
- return s
-
- def _remote(self, action):
- s = self._find_grail_rc()
- if not s:
- return 0
- s.send(action)
- s.close()
- return 1
-
def open(self, url, new=0, autoraise=True):
sys.audit("webbrowser.open", url)
if new:
@@ -475,35 +426,25 @@ def register_X_browsers():
if "KDE_FULL_SESSION" in os.environ and shutil.which("kfmclient"):
register("kfmclient", Konqueror, Konqueror("kfmclient"))
+ # Common symbolic link for the default X11 browser
if shutil.which("x-www-browser"):
register("x-www-browser", None, BackgroundBrowser("x-www-browser"))
# The Mozilla browsers
- for browser in ("firefox", "iceweasel", "iceape", "seamonkey"):
+ for browser in ("firefox", "iceweasel", "seamonkey", "mozilla-firefox",
+ "mozilla"):
if shutil.which(browser):
register(browser, None, Mozilla(browser))
- # The Netscape and old Mozilla browsers
- for browser in ("mozilla-firefox",
- "mozilla-firebird", "firebird",
- "mozilla", "netscape"):
- if shutil.which(browser):
- register(browser, None, Netscape(browser))
-
# Konqueror/kfm, the KDE browser.
if shutil.which("kfm"):
register("kfm", Konqueror, Konqueror("kfm"))
elif shutil.which("konqueror"):
register("konqueror", Konqueror, Konqueror("konqueror"))
- # Gnome's Galeon and Epiphany
- for browser in ("galeon", "epiphany"):
- if shutil.which(browser):
- register(browser, None, Galeon(browser))
-
- # Skipstone, another Gtk/Mozilla based browser
- if shutil.which("skipstone"):
- register("skipstone", None, BackgroundBrowser("skipstone"))
+ # Gnome's Epiphany
+ if shutil.which("epiphany"):
+ register("epiphany", None, Epiphany("epiphany"))
# Google Chrome/Chromium browsers
for browser in ("google-chrome", "chrome", "chromium", "chromium-browser"):
@@ -514,13 +455,6 @@ def register_X_browsers():
if shutil.which("opera"):
register("opera", None, Opera("opera"))
- # Next, Mosaic -- old but still in use.
- if shutil.which("mosaic"):
- register("mosaic", None, BackgroundBrowser("mosaic"))
-
- # Grail, the Python browser. Does anybody still use it?
- if shutil.which("grail"):
- register("grail", Grail, None)
def register_standard_browsers():
global _tryorder
@@ -549,7 +483,7 @@ def register_standard_browsers():
# 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",
+ for browser in ("firefox", "seamonkey", "mozilla", "chrome",
"opera", edge64, edge32):
if shutil.which(browser):
register(browser, None, BackgroundBrowser(browser))
@@ -570,14 +504,15 @@ def register_standard_browsers():
# Also try console browsers
if os.environ.get("TERM"):
+ # Common symbolic link for the default text-based browser
if shutil.which("www-browser"):
register("www-browser", None, GenericBrowser("www-browser"))
- # The Links/elinks browsers <http://artax.karlin.mff.cuni.cz/~mikulas/links/>
+ # The Links/elinks browsers <http://links.twibright.com/>
if shutil.which("links"):
register("links", None, GenericBrowser("links"))
if shutil.which("elinks"):
register("elinks", None, Elinks("elinks"))
- # The Lynx browser <http://lynx.isc.org/>, <http://lynx.browser.org/>
+ # The Lynx browser <https://lynx.invisible-island.net/>, <http://lynx.browser.org/>
if shutil.which("lynx"):
register("lynx", None, GenericBrowser("lynx"))
# The w3m browser <http://w3m.sourceforge.net/>
@@ -727,7 +662,7 @@ def main():
for o, a in opts:
if o == '-n': new_win = 1
elif o == '-t': new_win = 2
- elif o == '-h' or o == '--help':
+ elif o == '-h' or o == '--help':
print(usage, file=sys.stderr)
sys.exit()
if len(args) != 1:
diff --git a/Misc/NEWS.d/next/Library/2023-03-21-15-17-07.gh-issue-102871.U9mchn.rst b/Misc/NEWS.d/next/Library/2023-03-21-15-17-07.gh-issue-102871.U9mchn.rst
new file mode 100644
index 0000000..3ef0e74
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-03-21-15-17-07.gh-issue-102871.U9mchn.rst
@@ -0,0 +1,3 @@
+Remove support for obsolete browsers from :mod:`webbrowser`.
+Removed browsers include Grail, Mosaic, Netscape, Galeon, Skipstone,
+Iceape, Firebird, and Firefox versions 35 and below.
generated by cgit v0.12 at 2025-01-06 07:04:32 (GMT)