From a0a1ef8989a62a8ce3dd4d4578d0ad50addf0b4c Mon Sep 17 00:00:00 2001 From: nemunaire Date: Wed, 17 Sep 2014 06:59:40 +0200 Subject: [PATCH] Always parse the same number of arguments; empty string != None --- message.py | 2 +- server/IRC.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/message.py b/message.py index 4d16e23..8e32d6d 100644 --- a/message.py +++ b/message.py @@ -62,7 +62,7 @@ class Message: def parse_content(self): """Parse or reparse the message content""" # Remove ! - if self.text[0] == '!': + if len(self.text) > 1 and self.text[0] == '!': self.qual = "cmd" self.text = self.text[1:].strip() diff --git a/server/IRC.py b/server/IRC.py index 02cbf16..0373fa3 100644 --- a/server/IRC.py +++ b/server/IRC.py @@ -271,11 +271,11 @@ class IRCMessage: self.cmd = self.decode(p.group("command")) # Parse params - if p.group("params"): + if p.group("params") is not None: for param in p.group("params").strip().split(b' '): self.params.append(param) - if p.group("trailing"): + if p.group("trailing") is not None: self.params.append(p.group("trailing"))