pew
/
phenny-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow latin1 searches of etymonline, which doesn't seem to support utf-8.

master
Sean B. Palmer 2011-06-17 16:56:49 +01:00
parent 5261461f70
commit 7dbddc8429
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/etymology.py
View File

@ -46,7 +46,7 @@ def etymology(word):
raise ValueError("Word too long: %s[...]" % word[:10]) raise ValueError("Word too long: %s[...]" % word[:10])
word = {'axe': 'ax/axe'}.get(word, word) word = {'axe': 'ax/axe'}.get(word, word)
bytes = web.get(etyuri % word) bytes = web.get(etyuri % web.urllib.quote(word))
definitions = r_definition.findall(bytes) definitions = r_definition.findall(bytes)
if not definitions: if not definitions:
@ -77,7 +77,7 @@ def etymology(word):
def f_etymology(self, origin, match, args): def f_etymology(self, origin, match, args):
word = match.group(2) word = match.group(2)
try: result = etymology(word.encode('utf-8')) try: result = etymology(word.encode('iso-8859-1'))
except IOError: except IOError:
msg = "Can't connect to etymonline.com (%s)" % (etyuri % word) msg = "Can't connect to etymonline.com (%s)" % (etyuri % word)
self.msg(origin.sender, msg) self.msg(origin.sender, msg)
@ -92,7 +92,7 @@ def f_etymology(self, origin, match, args):
msg = 'Can\'t find the etymology for "%s". Try %s' % (word, uri) msg = 'Can\'t find the etymology for "%s". Try %s' % (word, uri)
self.msg(origin.sender, msg) self.msg(origin.sender, msg)
# @@ Cf. http://swhack.com/logs/2006-01-04#T01-50-22 # @@ Cf. http://swhack.com/logs/2006-01-04#T01-50-22
f_etymology.rule = (['ety'], r"([A-Za-z0-9' .-]+)$") f_etymology.rule = (['ety'], r"(.+?)$")
f_etymology.thread = True f_etymology.thread = True
f_etymology.priority = 'high' f_etymology.priority = 'high'