catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

bugfixing as pylint, pyflakes suggest

Browse Source
This commit is contained in:
urlbot
2014-10-20 07:46:05 +02:00
parent 29981b776a
commit 0b56d21101
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins.py
View File

@@ -83,7 +83,7 @@ def data_parse_other(data):
elif 'reply_user' == a: elif 'reply_user' == a:
args['reply_user'] = reply_user args['reply_user'] = reply_user
else: 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) ret = p['func'](args)
@@ -327,7 +327,7 @@ def command_decode(args):
try: try:
uni_name = unicodedata.name(char) uni_name = unicodedata.name(char)
except e as Exception: except Exception as e:
logger('plugin', 'decode(%s) failed: %s' %(char, str(e))) logger('plugin', 'decode(%s) failed: %s' %(char, str(e)))
return { return {
'msg': args['reply_user'] + ": can't decode %s (%s): %s" %(char, char_esc, str(e)) '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: elif 'reply_user' == a:
args['reply_user'] = reply_user args['reply_user'] = reply_user
else: 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) ret = p['func'](args)

7
urlbot.py
View File

@@ -94,7 +94,8 @@ def chat_write(message, prefix='/say '):
try: try:
msg = str(prefix) + str(message) + '\n' msg = str(prefix) + str(message) + '\n'
msg = msg.encode('utf8') msg = msg.encode('utf8')
except UnicodeDecodeError: except UnicodeDecodeError as e:
logger('warn', 'encoding msg failed: ' + str(e))
msg = prefix + message + '\n' msg = prefix + message + '\n'
fd.write(msg) fd.write(msg)
@@ -154,15 +155,11 @@ def extract_url(data):
lev_url = re.sub(r'https?://[^/]*/', '', url) lev_url = re.sub(r'https?://[^/]*/', '', url)
lev_res = levenshtein(lev_url, title) 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 = str_sim(title, lev_url)
sim_len_title = len(sim) sim_len_title = len(sim)
sim_len_url = len(sim[0]) sim_len_url = len(sim[0])
sim_sum = sum([sum(a) for a in sim]) 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 = conf_load()
obj['lev'].append((lev_res, title, url)) obj['lev'].append((lev_res, title, url))
obj['sim'].append((sim_sum, sim_len_title, sim_len_url, title, url)) obj['sim'].append((sim_sum, sim_len_title, sim_len_url, title, url))