From 9c2a8121ec4a465c28dd21263be44afb4c9c7b08 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 22 Oct 2003 01:40:27 +0000 Subject: [PATCH] Fixed bug in isNick. --- src/ircutils.py | 2 +- test/test_ircutils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ircutils.py b/src/ircutils.py index a7a3ccec1..0eedcdd73 100644 --- a/src/ircutils.py +++ b/src/ircutils.py @@ -95,7 +95,7 @@ def nickEqual(nick1, nick2): return toLower(nick1) == toLower(nick2) _nickchars = r'_[]\`^{}|-' -_nickre = re.compile(r'^[A-Za-z%s][0-9A-Za-z%s]+$' % (re.escape(_nickchars), +_nickre = re.compile(r'^[A-Za-z%s][0-9A-Za-z%s]*$' % (re.escape(_nickchars), re.escape(_nickchars))) def isNick(s): """Returns True if s is a valid IRC nick.""" diff --git a/test/test_ircutils.py b/test/test_ircutils.py index bdcdeeb3b..bcb62318b 100644 --- a/test/test_ircutils.py +++ b/test/test_ircutils.py @@ -118,6 +118,8 @@ class FunctionsTestCase(unittest.TestCase): self.failUnless(ircutils.isNick('[jemfinch]')) self.failUnless(ircutils.isNick('jem|finch')) self.failUnless(ircutils.isNick('\\```')) + self.failUnless(ircutils.isNick('`')) + self.failUnless(ircutils.isNick('A')) self.failIf(ircutils.isNick('')) self.failIf(ircutils.isNick('8foo')) self.failIf(ircutils.isNick('10'))