Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

Web: HTMLParseError is deprecated/unused since Python 3.3 and removed in Python 3.5.

Browse Source
This commit is contained in:
Valentin Lorentz 2015-08-10 18:16:02 +02:00
parent 34d384bd67
commit 6ceec0c541
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/Web/plugin.py
View File

@ -44,10 +44,10 @@ from supybot.i18n import PluginInternationalization, internationalizeDocstring
_ = PluginInternationalization('Web') _ = PluginInternationalization('Web')
if minisix.PY3: if minisix.PY3:
from html.parser import HTMLParser, HTMLParseError from html.parser import HTMLParser
from html.entities import entitydefs from html.entities import entitydefs
else: else:
from HTMLParser import HTMLParser, HTMLParseError from HTMLParser import HTMLParser
from htmlentitydefs import entitydefs from htmlentitydefs import entitydefs
class Title(HTMLParser): class Title(HTMLParser):
@ -159,11 +159,7 @@ class Web(callbacks.PluginRegexp):
except: except:
pass pass
parser = Title() parser = Title()
try: parser.feed(text)
parser.feed(text)
except HTMLParseError:
self.log.debug('Encountered a problem parsing %u. Title may '
'already be set, though', url)
if parser.title: if parser.title:
domain = utils.web.getDomain(fd.geturl() domain = utils.web.getDomain(fd.geturl()
if self.registryValue('snarferShowTargetDomain', channel) if self.registryValue('snarferShowTargetDomain', channel)
@ -289,11 +285,7 @@ class Web(callbacks.PluginRegexp):
if minisix.PY3 and isinstance(text, bytes): if minisix.PY3 and isinstance(text, bytes):
irc.error(_('Could not guess the page\'s encoding. (Try ' irc.error(_('Could not guess the page\'s encoding. (Try '
'installing python-charade.)'), Raise=True) 'installing python-charade.)'), Raise=True)
try: parser.feed(text)
parser.feed(text)
except HTMLParseError:
self.log.debug('Encountered a problem parsing %u. Title may '
'already be set, though', url)
if parser.title: if parser.title:
title = utils.web.htmlToText(parser.title.strip()) title = utils.web.htmlToText(parser.title.strip())
if not [y for x,y in optlist if x == 'no-filter']: if not [y for x,y in optlist if x == 'no-filter']: