Changed morse/unmorse and related stuff to be (hopefully) clearer.

plugins/Moobot.py

@@ -52,6 +52,7 @@ Commands include:
 
 from baseplugin import *
 
+import re
 import base64
 
 import ircmsgs
@@ -107,8 +108,9 @@ class Moobot(callbacks.Privmsg):
         "9" : "----.",
     }
 
-    _revcode = dict([(y.strip(), x) for (x, y) in _code.items()])
+    _revcode = dict([(y, x) for (x, y) in _code.items()])
 
+    _unmorsere = re.compile('([.-]+)')
     def unmorse(self, irc, msg, args):
         """<morse code text>
 
@@ -116,15 +118,14 @@ class Moobot(callbacks.Privmsg):
         """
         text = privmsgs.getArgs(args)
         L = []
-        for (first, second, third) in window(text.split(' ')+[''], 3):
+        def morseToLetter(m):
-            if first == '' and second == '' and third == '':
+            s = m.group(1)
-                L.append(' ')
+            return self._revcode.get(s, s)
-            else:
+        text = self._unmorsere.sub(morseToLetter, text)
-                try:
+        text = text.replace('  ', '\x00')
-                    L.append(self._revcode[first])
+        text = text.replace(' ', '')
-                except KeyError:
+        text = text.replace('\x00', ' ')
-                    L.append(first)
+        irc.reply(msg, text)
-        irc.reply(msg, ''.join(L))
 
     def morse(self, irc, msg, args):
         """<text>