Skip to content

web: use html.unescape() when available (Python 3.4+) #2204

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
dgw merged 1 commit into from
Nov 4, 2021
Merged

web: use html.unescape() when available (Python 3.4+) #2204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions sopel/tools/web.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
unichr = chr
unicode = str

try:
import html as HTMLLib
except ImportError:
HTMLLib = None

__all__ = [
'USER_AGENT',
'DEFAULT_HEADERS',
Expand Down Expand Up @@ -121,6 +126,16 @@ def decode(html):
:param str html: the HTML page or snippet to process
:return str: ``html`` with all entity references replaced
"""
if HTMLLib is not None:
# Python's stdlib has our back in 3.4+
# TODO: This should be the only implementation in Sopel 8
try:
return HTMLLib.unescape(html)
except AttributeError:
# Must be py3.3; fall through to our half-assed version.
pass

# Not on py3.4+ yet? Then you get to deal with the jankiness.
return r_entity.sub(entity, html)


Expand Down