From 0b96f40320c4d980c7e338ccfc525dbf027ed528 Mon Sep 17 00:00:00 2001 Message-Id: <0b96f40320c4d980c7e338ccfc525dbf027ed528.1713878586.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 18 May 2008 12:34:37 +0100 Subject: [PATCH] Fix disorder.py string parsing to not reject "" Organization: Straylight/Edgeware From: Richard Kettlewell --- python/disorder.py.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/disorder.py.in b/python/disorder.py.in index 595ee92..23f840c 100644 --- a/python/disorder.py.in +++ b/python/disorder.py.in @@ -62,8 +62,8 @@ _userconf = True # various regexps we'll use _ws = re.compile(r"^[ \t\n\r]+") -_squote = re.compile("'(([^\\\\']|\\\\[\\\\\"'n])+)'") -_dquote = re.compile("\"(([^\\\\\"]|\\\\[\\\\\"'n])+)\"") +_squote = re.compile("'(([^\\\\']|\\\\[\\\\\"'n])*)'") +_dquote = re.compile("\"(([^\\\\\"]|\\\\[\\\\\"'n])*)\"") _unquoted = re.compile("[^\"' \\t\\n\\r][^ \t\n\r]*") _response = re.compile("([0-9]{3}) ?(.*)") -- [mdw]