Skip to content
Browse files

Fix for Windows, and some more helpful error messages.

  • Loading branch information...
1 parent 87b9866 commit 68f2036546c286bb864dbc2ade251041bf7e6be9 Sean B. Palmer committed
Showing with 37 additions and 13 deletions.
  1. +4 −1 __init__.py
  2. +1 −1 bot.py
  3. +27 −7 modules/translate.py
  4. +5 −4 opt/freenode.py
View
5 __init__.py
@@ -36,7 +36,10 @@ def connect(config):
p = bot.Phenny(config)
p.run(config.host, config.port)
- Watcher()
+ try: Watcher()
+ except Exception, e:
+ print >> sys.stderr, 'Warning:', e, '(in __init__.py)'
+
while True:
try: connect(config)
except KeyboardInterrupt:
View
2 bot.py
@@ -55,7 +55,7 @@ def setup(self):
name = os.path.basename(filename)[:-3]
try: module = imp.load_source(name, filename)
except Exception, e:
- print >> sys.stderr, "Error loading %s: %s" % (name, e)
+ print >> sys.stderr, "Error loading %s: %s (in bot.py)" % (name, e)
else:
if hasattr(module, 'setup'):
module.setup(self)
View
34 modules/translate.py
@@ -37,13 +37,8 @@ def translate(text, input, output):
pair = input + '%7C' + output
bytes = web.get(uri + '?q=' + q + '&v=1.0&langpair=' + pair)
result = json(bytes)
- try: msg = result['responseData']['translatedText']
- except Exception:
- msg = 'The %s to %s translation failed, sorry!' % (input, output)
- else:
- msg = msg.encode('cp1252').replace(''', "'")
- msg = '"%s" (%s to %s, translate.google.com)' % (msg, input, output)
- return msg
+ try: return result['responseData']['translatedText'].encode('cp1252')
+ except Exception: return None
def tr(phenny, context):
"""Translates a phrase, with an optional language hint."""
@@ -63,6 +58,11 @@ def tr(phenny, context):
if input != output:
msg = translate(phrase, input, output)
+ if msg:
+ msg = msg.replace(''', "'")
+ msg = '"%s" (%s to %s, translate.google.com)' % (msg, input, output)
+ else: msg = 'The %s to %s translation failed, sorry!' % (input, output)
+
phenny.reply(msg)
else: phenny.reply('Ehwhatnow?')
@@ -70,5 +70,25 @@ def tr(phenny, context):
tr.example = '$nickname: "mon chien"? or $nickname: fr "mon chien"?'
tr.priority = 'low'
+def mangle(phenny, input):
+ phrase = input.group(2).encode('utf-8')
+ for lang in ['fr', 'de', 'es', 'it', 'ja']:
+ backup = phrase
+ phrase = translate(phrase, 'en', lang)
+ if not phrase:
+ phrase = backup
+ break
+ __import__('time').sleep(0.5)
+
+ backup = phrase
+ phrase = translate(phrase, lang, 'en')
+ if not phrase:
+ phrase = backup
+ break
+ __import__('time').sleep(0.5)
+
+ phenny.reply(phrase or 'ERRORS SRY')
+mangle.commands = ['mangle']
+
if __name__ == '__main__':
print __doc__.strip()
View
9 opt/freenode.py
@@ -9,7 +9,7 @@
def replaced(phenny, input):
command = input.group(1)
- response = {
+ responses = {
'cp': '.cp has been replaced by .u',
'pc': '.pc has been replaced by .u',
'unicode': '.unicode has been replaced by .u',
@@ -22,10 +22,11 @@ def replaced(phenny, input):
'thesaurus': ".thesaurus hasn't been ported to my new codebase yet",
'rates': "moon wanter. moOOoon wanter!",
'web': 'the .web command has been removed; ask sbp for details',
- 'mangle': ".mangle hasn't been ported to my new codebase yet",
'origin': ".origin hasn't been ported to my new codebase yet"
- }[command]
- phenny.reply(response)
+ }
+ try: response = responses[command]
+ except KeyError: return
+ else: phenny.reply(response)
replaced.commands = [
'cp', 'pc', 'unicode', 'compare', 'map', 'acronym', 'img',
'v', 'validate', 'thesaurus', 'rates', 'web', 'mangle', 'origin'

0 comments on commit 68f2036

Please sign in to comment.
Something went wrong with that request. Please try again.