From 99e35d6810d940211a5982043fe7786bd660e880 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Wed, 22 Sep 2004 13:13:37 +0000
Subject: [PATCH] Fixed a performance problem.

---
 plugins/Filter.py   | 38 ++++++++++++++++++++++++--------------
 test/test_Filter.py |  4 ++--
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/plugins/Filter.py b/plugins/Filter.py
index ccec75ae2..5c1bb08ce 100644
--- a/plugins/Filter.py
+++ b/plugins/Filter.py
@@ -40,6 +40,7 @@ import re
 import string
 import random
 import itertools
+from cStringIO import StringIO
 
 import supybot.conf as conf
 import supybot.utils as utils
@@ -510,6 +511,8 @@ class Filter(callbacks.Privmsg):
         'arr', 's': 'ess', 't': 'tee', 'u': 'you', 'v': 'vee', 'w':
         'double-you', 'x': 'ecks', 'y': 'why', 'z': 'zee'
     }
+    for (k, v) in _spellLetters.items():
+        _spellLetters[k.upper()] = v
     _spellPunctuation = {
         '!': 'exclamation point',
         '"': 'quote',
@@ -554,21 +557,28 @@ class Filter(callbacks.Privmsg):
         Returns <text>, phonetically spelled out.
         """
         text = privmsgs.getArgs(args)
-        replaceLetters  = self.registryValue('spellit.replaceLetters')
-        replacePunctuation  = self.registryValue('spellit.replacePunctuation')
-        replaceNumbers  = self.registryValue('spellit.replaceNumbers')
-        newtext = ''
+        d = {}
+        if self.registryValue('spellit.replaceLetters'):
+            d.update(self._spellLetters)
+        if self.registryValue('spellit.replaceNumbers'):
+            d.update(self._spellNumbers)
+        if self.registryValue('spellit.replacePunctuation'):
+            d.update(self._spellPunctuation)
+# A bug in unicode on OSX prevents me from testing this.
+##         dd = {}
+##         for (c, v) in d.iteritems():
+##             dd[ord(c)] = unicode(v + ' ')
+##         irc.reply(unicode(text).translate(dd))
+        out = StringIO()
+        write = out.write
         for c in text:
-            if self._spellLetters.has_key(c.lower()) and replaceLetters:
-                newtext += '%s ' % self._spellLetters[c.lower()]
-            elif self._spellPunctuation.has_key(c) and replacePunctuation:
-                newtext += '%s ' % self._spellPunctuation[c]
-            elif self._spellNumbers.has_key(c) and replaceNumbers:
-                newtext += '%s ' % self._spellNumbers[c]
-            else:
-                newtext += '%s' % c
-        irc.reply(newtext)
-
+            try:
+                c = d[c]
+                write(' ')
+            except KeyError:
+                pass
+            write(c)
+        irc.reply(out.getvalue())
 
 
 Class = Filter
diff --git a/test/test_Filter.py b/test/test_Filter.py
index 844f0d0c7..04c0a9827 100644
--- a/test/test_Filter.py
+++ b/test/test_Filter.py
@@ -93,11 +93,11 @@ class FilterTest(ChannelPluginTestCase, PluginDocumentation):
                           'exclamation point period percent')
         self.assertNotError('config plugins.Filter.spellit.replaceLetters off')
         self.assertRegexp('spellit asasdfasdf12345@#$!%^',
-                          'asasdfasdfone two three four five at pound '
+                          'asasdfasdf one two three four five at pound '
                           'dollar sign exclamation point percent caret')
         self.assertNotError('config plugins.Filter.spellit.replaceNumbers off')
         self.assertRegexp('spellit asasdfasdf12345@#$!%^',
-                          'asasdfasdf12345at pound dollar sign exclamation '
+                          'asasdfasdf12345 at pound dollar sign exclamation '
                           'point percent caret')
         self.assertNotError('config '
                             'plugins.Filter.spellit.replacePunctuation off')