From c493e7ca07cca403334eabcc069d5bc1cb468220 Mon Sep 17 00:00:00 2001 From: "Sean B. Palmer" Date: Fri, 22 Jul 2011 15:53:16 +0100 Subject: [PATCH] Better file management in Wikipedia module, and deleted the Encarta module. --- modules/dict.py | 56 -------------------------------------------- modules/wikipedia.py | 2 ++ 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100755 modules/dict.py diff --git a/modules/dict.py b/modules/dict.py deleted file mode 100755 index 8fa6182..0000000 --- a/modules/dict.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python -""" -dict.py - Phenny Dictionary Module -Copyright 2008-9, Sean B. Palmer, inamidst.com -Licensed under the Eiffel Forum License 2. - -http://inamidst.com/phenny/ -""" - -import re, urllib -import web -from tools import deprecated - -r_li = re.compile(r'(?ims)
  • .*?
  • ') -r_tag = re.compile(r'<[^>]+>') -r_parens = re.compile(r'(?<=\()(?:[^()]+|\([^)]+\))*(?=\))') -r_word = re.compile(r'^[A-Za-z0-9\' -]+$') - -uri = 'http://encarta.msn.com/dictionary_/%s.html' -r_info = re.compile( - r'(?:ResultBody">

    (.*?) )|(?:(.*?))' -) - -def dict(phenny, input): - if not input.group(2): - return phenny.reply("Nothing to define.") - word = input.group(2) - word = urllib.quote(word.encode('utf-8')) - - def trim(thing): - if thing.endswith(' '): - thing = thing[:-6] - return thing.strip(' :.') - - bytes = web.get(uri % word) - results = {} - wordkind = None - for kind, sense in r_info.findall(bytes): - kind, sense = trim(kind), trim(sense) - if kind: wordkind = kind - elif sense: - results.setdefault(wordkind, []).append(sense) - result = input.group(2).encode('utf-8') + ' - ' - for key in sorted(results.keys()): - if results[key]: - result += (key or '') + ' 1. ' + results[key][0] - if len(results[key]) > 1: - result += ', 2. ' + results[key][1] - result += '; ' - result = result.rstrip('; ') - if result.endswith('-') and (len(result) < 30): - phenny.reply('Sorry, no definition found.') - else: phenny.say(result) - -if __name__ == '__main__': - print __doc__.strip() diff --git a/modules/wikipedia.py b/modules/wikipedia.py index 4ad0113..7d83893 100755 --- a/modules/wikipedia.py +++ b/modules/wikipedia.py @@ -75,6 +75,8 @@ def wikipedia(term, language='en', last=False): f.seek(0) gzip_file = gzip.GzipFile(fileobj=f) bytes = gzip_file.read() + gzip_file.close() + f.close() bytes = r_tr.sub('', bytes)