From: philipp Date: Fri, 27 Jan 2017 22:03:55 +0000 (+0000) Subject: Improved wikipage_from_str: Now it does not accept '[' or ']' in article titles. X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/wrpylib.git/commitdiff_plain/7e1b74fd7533f6d2f98b0a7244c031fe8ac74f02 Improved wikipage_from_str: Now it does not accept '[' or ']' in article titles. git-svn-id: http://www.winterrodeln.org/svn/wrpylib/trunk@2604 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- diff --git a/wrpylib/wrvalidators.py b/wrpylib/wrvalidators.py index 2bab588..f10348d 100644 --- a/wrpylib/wrvalidators.py +++ b/wrpylib/wrvalidators.py @@ -354,7 +354,7 @@ def wikipage_from_str(value): An empty string is an error. '[[Birgitzer Alm]]' => '[[Birgitzer Alm]]' """ - if not value.startswith('[[') or not value.endswith(']]'): + if re.match(r'\[\[[^\[\]]+\]\]$', value) is None: raise ValueError('No valid wiki page name "{}"'.format(value)) return value