[IMP] util/misc: allow more than two terms in expand_braces

It's useful to specify xmlids, e.g.
```
names = [
    *eb("mod_111_{03,06,09,12}"),
    *eb("mod_303_{01,03,04,06}"),
]
```

Part of odoo/upgrade#5177

Signed-off-by: Alvaro Fuentes Suarez (afu) <[email protected]>
Co-authored-by: Christophe Simonis <[email protected]>

Author: aj-fuentes

src/base/tests/test_util.py

@@ -753,3 +753,48 @@ def test_replace_in_all_jsonb_values(self):
         self.assertRegex(test_partner_title.name, pattern_new)
         self.assertRegex(test_partner_title.name, pattern_notouch)
         self.assertNotRegex(test_partner_title.name, pattern_old)
+
+
+class TestMisc(UnitTestCase):
+    @parametrize(
+        [
+            ("{a,b}", ["a", "b"]),
+            ("head_{a,b}_tail", ["head_a_tail", "head_b_tail"]),
+            ("head_only_{a,b}", ["head_only_a", "head_only_b"]),
+            ("{a,b}_tail_only", ["a_tail_only", "b_tail_only"]),
+            ("{with,more,than,one,comma}", ["with", "more", "than", "one", "comma"]),
+            ("head_{one,two,three}_tail", ["head_one_tail", "head_two_tail", "head_three_tail"]),
+            ("same_{a,a}", ["same_a", "same_a"]),
+            ("empty_part_{a,}", ["empty_part_a", "empty_part_"]),
+            ("empty_part_{,b}", ["empty_part_", "empty_part_b"]),
+            ("two_empty_{,}", ["two_empty_", "two_empty_"]),
+            ("with_cr\n_{a,b}", ["with_cr\n_a", "with_cr\n_b"]),
+            ("with_cr_in_{a\nb,c\nd}_end", ["with_cr_in_a\nb_end", "with_cr_in_c\nd_end"]),
+        ]
+    )
+    def test_expand_braces(self, value, expected):
+        self.assertEqual(util.expand_braces(value), expected)
+
+    @parametrize(
+        [
+            (value,)
+            for value in [
+                "",
+                "no_braces",
+                "empty_{}",
+                "one_{item}",
+                "unclosed_{_brace",
+                "two_{a,b}_expanses_{x,y}",
+                # braces into braces
+                "{a,{b,c},d}",
+                "{a,{}",
+                "{a,b}c}",
+                "{a,{b,}",
+                "{{}}",
+                "{{one}}",
+            ]
+        ]
+    )
+    def test_expand_braces_failure(self, value):
+        with self.assertRaises(ValueError):
+            util.expand_braces(value)

src/util/misc.py

@@ -108,18 +108,14 @@ def splitlines(s):
 
 def expand_braces(s):
     # expand braces (a la bash)
-    # only handle one expension of a 2 parts (because we don't need more)
-    r = re.compile(r"(.*){([^},]*?,[^},]*?)}(.*)")
+    r = re.compile(r"(.*){((?:[^},]*?)(?:,[^},]*?)+)}(.*)", flags=re.DOTALL)
     m = r.search(s)
     if not m:
         raise ValueError("No expansion braces found")
-    head, match, tail = m.groups()
-    a, b = match.split(",")
-    first = head + a + tail
-    second = head + b + tail
-    if r.search(first):  # as the regexp will match the last expansion, we only need to verify first term
-        raise ValueError("Multiple expansion braces found")
-    return [first, second]
+    head, matches, tail = m.groups()
+    if re.search("[}{]", head + matches + tail):
+        raise ValueError("Extra braces detected")
+    return [head + x + tail for x in matches.split(",")]
 
 
 def split_osenv(name):