Merge https://github.com/sbp/phenny

2011-07-11 12:13:51 -04:00
parent b99079a516 7dbddc8429
commit 4e25fa7bf9
9 changed files with 56 additions and 21 deletions
--- a/bot.py
+++ b/bot.py
@@ -94,8 +94,8 @@ class Phenny(irc.Bot):

      def sub(pattern, self=self): 
         # These replacements have significant order
-         pattern = pattern.replace('$nickname', self.nick)
-         return pattern.replace('$nick', r'%s[,:] +' % self.nick)
+         pattern = pattern.replace('$nickname', re.escape(self.nick))
+         return pattern.replace('$nick', r'%s[,:] +' % re.escape(self.nick))

      for name, func in self.variables.iteritems(): 
         # print name, func