Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added flags class attribute to PrivmsgRegexp

This commit is contained in:
Jeremy Fincher 2003-04-01 07:59:17 +00:00
parent f0cfa30eee
commit cd5781c81a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/callbacks.py
View File

@ -351,7 +351,11 @@ class Privmsg(irclib.IrcCallback):
thread.start() thread.start()
debug.printf('Spawned new thread: %s' % thread) debug.printf('Spawned new thread: %s' % thread)
else: else:
f(irc, msg, args) try:
f(irc, msg, args)
except Exception, e:
debug.recoverableException()
irc.error(msg, debug.exnToString(e))
_r = re.compile(r'^(\S+)') _r = re.compile(r'^(\S+)')
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
@ -401,11 +405,16 @@ class PrivmsgRegexp(Privmsg):
expression matches. Callbacks must have the signature (self, irc, msg, expression matches. Callbacks must have the signature (self, irc, msg,
match) to be counted as such. match) to be counted as such.
A class-level flags attribute is used to determine what regexp flags to
compile the regular expressions with. By default, it's re.I, which means
regular expressions are by default case-insensitive.
If you have a standard command-type callback, though, Privmsg is a much If you have a standard command-type callback, though, Privmsg is a much
better class to use, at the very least for consistency's sake, but also better class to use, at the very least for consistency's sake, but also
because it's much more easily coded and maintained. because it's much more easily coded and maintained.
""" """
threaded = False # Again, like Privmsg... threaded = False # Again, like Privmsg...
flags = re.I
def __init__(self): def __init__(self):
Privmsg.__init__(self) Privmsg.__init__(self)
if self.threaded: if self.threaded:
@ -420,7 +429,7 @@ class PrivmsgRegexp(Privmsg):
inspect.getargs(value.im_func.func_code) == \ inspect.getargs(value.im_func.func_code) == \
(['self', 'irc', 'msg', 'match'], None, None): (['self', 'irc', 'msg', 'match'], None, None):
try: try:
r = re.compile(value.__doc__) r = re.compile(value.__doc__, self.flags)
self.res.append((r, value)) self.res.append((r, value))
except sre_constants.error, e: except sre_constants.error, e:
s = '%s.%s has an invalid regexp %s: %s' % \ s = '%s.%s has an invalid regexp %s: %s' % \