Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 11:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Web: Fix unicode problems for titleSnarfer."

Browse Source 
This reverts commit 3579701d2d.
This commit is contained in:
Valentin Lorentz 2012-05-11 18:10:23 +02:00
parent 4692f831d4
commit 86f541e6db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Web/plugin.py
View File

@ -97,13 +97,13 @@ class Web(callbacks.PluginRegexp):
return return
parser = Title() parser = Title()
try: try:
parser.feed(text.decode('utf-8')) parser.feed(text)
except HTMLParser.HTMLParseError: except HTMLParser.HTMLParseError:
self.log.debug('Encountered a problem parsing %u. Title may ' self.log.debug('Encountered a problem parsing %u. Title may '
'already be set, though', url) 'already be set, though', url)
if parser.title: if parser.title:
domain = utils.web.getDomain(url) domain = utils.web.getDomain(url)
title = utils.web.htmlToText(parser.title.strip().encode('utf-8')) title = utils.web.htmlToText(parser.title.strip())
s = format(_('Title: %s (at %s)'), title, domain) s = format(_('Title: %s (at %s)'), title, domain)
irc.reply(s, prefixNick=False) irc.reply(s, prefixNick=False)
titleSnarfer = urlSnarfer(titleSnarfer) titleSnarfer = urlSnarfer(titleSnarfer)
@ -178,12 +178,12 @@ class Web(callbacks.PluginRegexp):
text = utils.web.getUrl(url, size=size) text = utils.web.getUrl(url, size=size)
parser = Title() parser = Title()
try: try:
parser.feed(text.decode('utf-8')) parser.feed(text)
except HTMLParser.HTMLParseError: except HTMLParser.HTMLParseError:
self.log.debug('Encountered a problem parsing %u. Title may ' self.log.debug('Encountered a problem parsing %u. Title may '
'already be set, though', url) 'already be set, though', url)
if parser.title: if parser.title:
irc.reply(utils.web.htmlToText(parser.title.strip().encode('utf-8'))) irc.reply(utils.web.htmlToText(parser.title.strip()))
elif len(text) < size: elif len(text) < size:
irc.reply(_('That URL appears to have no HTML title.')) irc.reply(_('That URL appears to have no HTML title.'))
else: else: