From 5a505b9fc9fe92f63289f2bb5612abf04a9fdf01 Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 3 Oct 2018 16:57:53 +0000 Subject: [PATCH] Use consistent matching between NSEdoc and Zenmap parsers. Bad example: creds.[service] --- zenmap/zenmapCore/ScriptMetadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenmap/zenmapCore/ScriptMetadata.py b/zenmap/zenmapCore/ScriptMetadata.py index 447c5cc47..97e32a64d 100644 --- a/zenmap/zenmapCore/ScriptMetadata.py +++ b/zenmap/zenmapCore/ScriptMetadata.py @@ -456,9 +456,9 @@ class ScriptMetadata (object): returned as a list of (argname, description) tuples.""" args = [] for tag_name, tag_text in nsedoc_tags_iter(f): - m = re.match(r'([\w._-]+)', tag_text) + m = re.match(r'(\S+)\s+(.*?)', tag_text, re.DOTALL) if (tag_name == "arg" or tag_name == "args") and m: - args.append((m.group(1), re.sub(r'^[\w._-]+', '', tag_text))) + args.append((m.group(1), m.group(2))) return args def get_arguments(self, filename):