diff --git a/plugins.py b/plugins.py index 6bb2fd6..6359cc0 100644 --- a/plugins.py +++ b/plugins.py @@ -83,7 +83,7 @@ def data_parse_other(data): elif 'reply_user' == a: args['reply_user'] = reply_user else: - logger('warn', 'unknown required arg for %s: %s' %(f, a)) + logger('warn', 'unknown required arg for %s: %s' %(p['name'], a)) ret = p['func'](args) @@ -327,7 +327,7 @@ def command_decode(args): try: uni_name = unicodedata.name(char) - except e as Exception: + except Exception as e: logger('plugin', 'decode(%s) failed: %s' %(char, str(e))) return { 'msg': args['reply_user'] + ": can't decode %s (%s): %s" %(char, char_esc, str(e)) @@ -399,7 +399,7 @@ def data_parse_commands(data): elif 'reply_user' == a: args['reply_user'] = reply_user else: - logger('warn', 'unknown required arg for %s: %s' %(f, a)) + logger('warn', 'unknown required arg for %s: %s' %(p['name'], a)) ret = p['func'](args) diff --git a/urlbot.py b/urlbot.py index 82919e4..b24c35c 100755 --- a/urlbot.py +++ b/urlbot.py @@ -94,7 +94,8 @@ def chat_write(message, prefix='/say '): try: msg = str(prefix) + str(message) + '\n' msg = msg.encode('utf8') - except UnicodeDecodeError: + except UnicodeDecodeError as e: + logger('warn', 'encoding msg failed: ' + str(e)) msg = prefix + message + '\n' fd.write(msg) @@ -154,15 +155,11 @@ def extract_url(data): lev_url = re.sub(r'https?://[^/]*/', '', url) lev_res = levenshtein(lev_url, title) - lev_str = 'lev=%d/%d:%d ' %(lev_res, len(title), len(lev_url)) - sim = str_sim(title, lev_url) sim_len_title = len(sim) sim_len_url = len(sim[0]) sim_sum = sum([sum(a) for a in sim]) - sim_str = 'sim=%d/%d:%d ' %(sim_sum, sim_len_title, sim_len_url) - obj = conf_load() obj['lev'].append((lev_res, title, url)) obj['sim'].append((sim_sum, sim_len_title, sim_len_url, title, url))