From c40738b2ea87673e615ec13d47565d8252662d09 Mon Sep 17 00:00:00 2001 From: Michal Cihar Date: Fri, 25 Sep 2009 12:50:42 +0000 Subject: [PATCH] Use non consuming expressions to allow escape more strings in one row. --- osc/cmdln.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/osc/cmdln.py b/osc/cmdln.py index 236e2b96..43d83b84 100644 --- a/osc/cmdln.py +++ b/osc/cmdln.py @@ -118,12 +118,12 @@ def alias(*aliases): return decorate MAN_REPLACES = [ - (re.compile(r'(^|[ \t\[\'])--([^/ \t-]*)-([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\-\2\-\3\-\4\5'), - (re.compile(r'(^|[ \t\[\'])-([^/ \t-]*)-([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\2\-\3\-\4\5'), - (re.compile(r'(^|[ \t\[\'])--([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\-\2\-\3\4'), - (re.compile(r'(^|[ \t\[\'])-([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\2\-\3\4'), - (re.compile(r'(^|[ \t\[\'])--([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\-\2\3'), - (re.compile(r'(^|[ \t\[\'])-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\2\3'), + (re.compile(r'(^|[ \t\[\'])--([^/ \t/,-]*)-([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\-\2\-\3\-\4'), + (re.compile(r'(^|[ \t\[\'])-([^/ \t/,-]*)-([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\2\-\3\-\4'), + (re.compile(r'(^|[ \t\[\'])--([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\-\2\-\3'), + (re.compile(r'(^|[ \t\[\'])-([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\2\-\3'), + (re.compile(r'(^|[ \t\[\'])--([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\-\2'), + (re.compile(r'(^|[ \t\[\'])-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\2'), (re.compile(r"^'"), r" '"), ]