re.escape() arguments for 'contains()' (#2446)

mikf · Apr 7, 2022 · d78a2c7 · d78a2c7
1 parent 78e5d0c
commit d78a2c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/gallery_dl/util.py b/gallery_dl/util.py
@@ -79,7 +79,7 @@ def contains(values, elements):
     if isinstance(values, str):
         fmt = r"\b{}\b".format
         for e in elements:
-            if re.search(fmt(e), values):
+            if re.compile(fmt(re.escape(e))).search(values):
                 return True
     else:
         for e in elements:

diff --git a/test/test_util.py b/test/test_util.py
@@ -328,9 +328,8 @@ def test_contains(self):
         self.assertFalse(util.contains(c, "bar"))
         self.assertFalse(util.contains(c, [2, 5, "bar"]))
 
-        s = "1, 2, 3, asd, qwe, yxc, foo, bar"
-        self.assertTrue(util.contains(s, 2))
-        self.assertTrue(util.contains(s, "asd"))
+        s = "1, 2, 3, asd, qwe, y(+)c, f(+)(-), bar"
+        self.assertTrue(util.contains(s, "y(+)c"))
         self.assertTrue(util.contains(s, ["asd", "qwe", "yxc"]))
         self.assertTrue(util.contains(s, ["sdf", "dfg", "qwe"]))
         self.assertFalse(util.contains(s, "tag1"))