8000 gh-102871: Remove obsolete browsers from webbrowser by DBJim · Pull Request #102872 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-102871: Remove obsolete browsers from webbrowser #102872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 31, 2023
Merged

gh-102871: Remove obsolete browsers from webbrowser #102872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b04087c
Remove obsolete browsers and test from webbrowser
DBJim Mar 21, 2023
cf7209d
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 21, 2023
aee1f91
Small comment fix
DBJim Mar 22, 2023
ee7c864
Remove Skipstone
DBJim Mar 22, 2023
5eeb10a
Merge branch 'python:main' into main
DBJim Mar 26, 2023
798f439
Fix whitespace test failure and spacing between classes
DBJim Mar 26, 2023
21bcde7
Name the removed browsers in News and Module docs
DBJim Mar 27, 2023
90fa6d2
Register epiphany by name to match surrounding code
DBJim Mar 27, 2023
bdab968
Fix typo
DBJim Mar 27, 2023
7b1d4f9
Add 'whatsnew' entry
DBJim Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove obsolete browsers and test from webbrowser
  • Loading branch information
@DBJim
DBJim committed Mar 21, 2023
commit b04087c7435fb4a8cb9c638be3168aab95be2ed9
10 changes: 1 addition & 9 deletions Doc/library/webbrowser.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +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')` | |
| ``'epiphany'`` | :class:`Epiphany('epiphany')` | |
+------------------------+-----------------------------------------+-------+
| ``'skipstone'`` | :class:`BackgroundBrowser('skipstone')` | |
+------------------------+-----------------------------------------+-------+
Expand All @@ -129,12 +125,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')` | |
Expand Down
31 changes: 3 additions & 28 deletions Lib/test/test_webbrowser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
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'


Expand Down Expand Up @@ -120,34 +120,9 @@ def test_open_new_tab(self):
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',
Expand Down
86 changes: 12 additions & 74 deletions Lib/webbrowser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -401,45 +390,6 @@ def open(self, url, new=0, autoraise=True):
else:
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:
Expand Down Expand Up @@ -475,31 +425,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 text-based 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))
# Gnome's Epiphany
if shutil.which("epiphany"):
register(browser, None, Epiphany("epiphany"))

# Skipstone, another Gtk/Mozilla based browser
if shutil.which("skipstone"):
Expand All @@ -514,13 +458,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
Expand Down Expand Up @@ -549,7 +486,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))
Expand All @@ -570,14 +507,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/>
Expand Down
0