more group(x) changes

materialsproject · Jun 9, 2024 · e0e0fe3 · e0e0fe3
1 parent f4d3ec5
commit e0e0fe3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/dev_scripts/update_pt_data.py b/dev_scripts/update_pt_data.py
@@ -30,24 +30,24 @@ def parse_oxi_state():
     oxi_data = re.sub("[\n\r]", "", oxi_data)
     patt = re.compile("<tr>(.*?)</tr>", re.MULTILINE)
 
-    for m in patt.finditer(oxi_data):
-        line = m.group(1)
+    for match in patt.finditer(oxi_data):
+        line = match[1]
         line = re.sub("</td>", "", line)
         line = re.sub("(<td>)+", "<td>", line)
         line = re.sub("</*a[^>]*>", "", line)
         el = None
         oxi_states = []
         common_oxi = []
         for tok in re.split("<td>", line.strip()):
-            m2 = re.match(r"<b>([A-Z][a-z]*)</b>", tok)
-            if m2:
-                el = m2.group(1)
+            match2 = re.match(r"<b>([A-Z][a-z]*)</b>", tok)
+            if match2:
+                el = match2[1]
             else:
-                m3 = re.match(r"(<b>)*([\+\-]\d)(</b>)*", tok)
-                if m3:
-                    oxi_states += [int(m3.group(2))]
-                    if m3.group(1):
-                        common_oxi += [int(m3.group(2))]
+                match3 = re.match(r"(<b>)*([\+\-]\d)(</b>)*", tok)
+                if match3:
+                    oxi_states += [int(match3[2])]
+                    if match3[1]:
+                        common_oxi += [int(match3[2])]
         if el in data:
             del data[el]["Max oxidation state"]
             del data[el]["Min oxidation state"]

diff --git a/pymatgen/analysis/reaction_calculator.py b/pymatgen/analysis/reaction_calculator.py
@@ -283,8 +283,8 @@ def from_str(cls, rxn_str: str) -> Self:
 
         def get_comp_amt(comp_str):
             return {
-                Composition(m.group(2)): float(m.group(1) or 1)
-                for m in re.finditer(r"([\d\.]*(?:[eE]-?[\d\.]+)?)\s*([A-Z][\w\.\(\)]*)", comp_str)
+                Composition(match[2]): float(match[1] or 1)
+                for match in re.finditer(r"([\d\.]*(?:[eE]-?[\d\.]+)?)\s*([A-Z][\w\.\(\)]*)", comp_str)
             }
 
         return BalancedReaction(get_comp_amt(rct_str), get_comp_amt(prod_str))

diff --git a/pymatgen/util/string.py b/pymatgen/util/string.py
@@ -71,13 +71,13 @@ def to_unicode_string(self):
         with systems where the sub and superscripts are pure integers.
         """
         str_ = self.to_latex_string()
-        for m in re.finditer(r"\$_\{(\d+)\}\$", str_):
-            s1 = m.group()
-            s2 = [SUBSCRIPT_UNICODE[s] for s in m.group(1)]
+        for match in re.finditer(r"\$_\{(\d+)\}\$", str_):
+            s1 = match.group()
+            s2 = [SUBSCRIPT_UNICODE[s] for s in match[1]]
             str_ = str_.replace(s1, "".join(s2))
-        for m in re.finditer(r"\$\^\{([\d\+\-]+)\}\$", str_):
-            s1 = m.group()
-            s2 = [SUPERSCRIPT_UNICODE[s] for s in m.group(1)]
+        for match in re.finditer(r"\$\^\{([\d\+\-]+)\}\$", str_):
+            s1 = match.group()
+            s2 = [SUPERSCRIPT_UNICODE[s] for s in match[1]]
             str_ = str_.replace(s1, "".join(s2))
         return str_