#671: updated substring replacement function regex

man-group · Jun 15, 2022 · 862437e · 862437e
1 parent b6e284b
commit 862437e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dtale/column_replacements.py b/dtale/column_replacements.py
@@ -88,7 +88,7 @@ def build_column(self, data):
         value = re.escape(value)
         if is_char:
             value = "[{value}]+".format(value=value)
-        regex_pat = re.compile(r"^ *{value} *$".format(value=value), flags=flags)
+        regex_pat = re.compile(r"^.*{value}.*$".format(value=value), flags=flags)
         replace_with = get_replacement_value(self.cfg, "replace")
         return data[self.col].replace(regex_pat, replace_with, regex=True)
 
@@ -100,7 +100,7 @@ def build_code(self, data):
 
         regex_exp = "r'^ *{value} *$'.format(value=re.escape({value}))"
         if is_char:
-            regex_exp = "r'^ *[{value}]+ *$'.format(value=re.escape({value}))"
+            regex_exp = "r'^.*[{value}].*$'.format(value=re.escape({value}))"
         regex_exp = regex_exp.format(value=value)
 
         replace_with = get_replacement_value_as_str(self.cfg, "replace", data[self.col])

diff --git a/frontend/static/popups/replacement/Strings.tsx b/frontend/static/popups/replacement/Strings.tsx
@@ -42,7 +42,7 @@ export const buildCode = (col: string, colType: string, cfg: StringsConfig): Cre
   return [
     'import re',
     '',
-    `regex_pat = re.compile(r'^ *${valStr} *$', flags=${flags})`,
+    `regex_pat = re.compile(r'^.*${valStr}.*$', flags=${flags})`,
     `df.loc[:, '${col}'] = df['${col}'].replace(regex_pat, ${replaceVal}, regex=True)`,
   ];
 };