From cf4b7e50e5262f734c24d541e9ed67b423b27ac8 Mon Sep 17 00:00:00 2001 From: Ryan Hitchman Date: Mon, 22 Feb 2010 19:22:47 -0700 Subject: [PATCH] make dice case-insensitive, improve remember.py:forget formatting --- plugins/dice.py | 7 ++++--- plugins/remember.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/dice.py b/plugins/dice.py index d4f6523..a1d316b 100644 --- a/plugins/dice.py +++ b/plugins/dice.py @@ -9,9 +9,10 @@ from util import hook whitespace_re = re.compile(r'\s+') -valid_diceroll_re = re.compile(r'^[+-]?(\d+|\d*d\d+)([+-](\d+|\d*d\d+))*$') -sign_re = re.compile(r'[+-]?(?:\d*d)?\d+') -split_re = re.compile(r'([\d+-]*)d?(\d*)') +valid_diceroll_re = re.compile(r'^[+-]?(\d+|\d*d\d+)([+-](\d+|\d*d\d+))*$', + re.I) +sign_re = re.compile(r'[+-]?(?:\d*d)?\d+', re.I) +split_re = re.compile(r'([\d+-]*)d?(\d*)', re.I) def nrolls(count, n): diff --git a/plugins/remember.py b/plugins/remember.py index 60633a0..840539a 100644 --- a/plugins/remember.py +++ b/plugins/remember.py @@ -53,7 +53,7 @@ def forget(inp, chan='', db=None): db.execute("delete from memory where chan=? and word=lower(?)", (chan, inp)) db.commit() - return 'forgot that %r' % data + return 'forgot that "%s"' % data.replace('"', "''") else: return "I don't know about that."