diff options
| author | Sean B. Palmer <sbp@aldebaran.local> | 2011-05-20 19:11:55 +0100 |
|---|---|---|
| committer | Sean B. Palmer <sbp@aldebaran.local> | 2011-05-20 19:11:55 +0100 |
| commit | 78ec2730460e8271e3a9d96056799785e6866f83 (patch) | |
| tree | 0d7bc037074e91c6fb2e53ca4dd965c665df9044 | |
| parent | ccd0343d131799985f18cf5ac6c3c963bed230aa (diff) | |
| download | bot-78ec2730460e8271e3a9d96056799785e6866f83.tar.gz bot-78ec2730460e8271e3a9d96056799785e6866f83.tar.bz2 bot-78ec2730460e8271e3a9d96056799785e6866f83.zip | |
Fixing a bug with regexp matching when the bot has a metachar name.
| -rwxr-xr-x | bot.py | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | modules/wikipedia.py | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -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 diff --git a/modules/wikipedia.py b/modules/wikipedia.py index 4a4a11b..b476ba3 100755..100644 --- a/modules/wikipedia.py +++ b/modules/wikipedia.py @@ -127,7 +127,8 @@ def wikipedia(term, language='en', last=False): sentence = ' '.join(words) + ' [...]' if (('using the Article Wizard if you wish' in sentence) - or ('or add a request for it' in sentence)): + or ('or add a request for it' in sentence) + or ('in existing articles' in sentence)): if not last: term = search(term) return wikipedia(term, language=language, last=True) |