From f9ec5f0315d49951c045190de8ee11f824f60d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Yvin?= <leo.yvin@budget-insight.com>
Date: Wed, 6 Jan 2021 11:05:45 +0100
Subject: [PATCH] weboob.tools.value: normalize regexp for consistency

In Value.check_valid method, regexp in validation error message
is not consistent with actual matching test: it uses re.match
and adds ending anchor.
We can "normalize" regexp in objet initialization to be consistent.
---
 weboob/tools/value.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/weboob/tools/value.py b/weboob/tools/value.py
index f3fdfa1fc3..84371ac508 100644
--- a/weboob/tools/value.py
+++ b/weboob/tools/value.py
@@ -77,7 +77,7 @@ def __init__(self, *args, **kwargs):
         self.default = kwargs.get('default', None)
         if isinstance(self.default, str):
             self.default = to_unicode(self.default)
-        self.regexp = kwargs.get('regexp', None)
+        self.regexp = self.get_normalized_regexp(kwargs.get('regexp', None))
         self.choices = kwargs.get('choices', None)
         self.aliases = kwargs.get('aliases')
         if isinstance(self.choices, (list, tuple)):
@@ -88,6 +88,18 @@ def __init__(self, *args, **kwargs):
         self.required = kwargs.get('required', self.default is None)
         self._value = kwargs.get('value', None)
 
+    @staticmethod
+    def get_normalized_regexp(regexp):
+        """ Return normalized regexp adding missing anchors """
+
+        if not regexp:
+            return regexp
+        if not regexp.startswith('^'):
+            regexp = '^' + regexp
+        if not regexp.endswith('$'):
+            regexp += '$'
+        return regexp
+
     def show_value(self, v):
         if self.masked:
             return u''
@@ -106,7 +118,7 @@ def check_valid(self, v):
             return
         if v == '' and self.default != '' and (self.choices is None or v not in self.choices):
             raise ValueError('Value can\'t be empty')
-        if self.regexp is not None and not re.match(self.regexp + '$', unicode(v) if v is not None else ''):
+        if self.regexp is not None and not re.match(self.regexp, unicode(v) if v is not None else ''):
             raise ValueError('Value "%s" does not match regexp "%s"' % (self.show_value(v), self.regexp))
         if self.choices is not None and v not in self.choices:
             if not self.aliases or v not in self.aliases:
-- 
GitLab