From: Bob Halley <halley@dnspython.org>
Date: Sat, 21 Sep 2024 16:00:28 +0000 (-0700)
Subject: Reorganize _parse_modify() to remove spurious warnings
X-Git-Tag: v2.7.0rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36dafb2d59488957f8701d0b61fb9dbb9914ecc2;p=thirdparty%2Fdnspython.git

Reorganize _parse_modify() to remove spurious warnings
about used-before-set variables, and avoid extra re matching
when not needed.
---

diff --git a/dns/zonefile.py b/dns/zonefile.py
index 873deb1f..09efa2b5 100644
--- a/dns/zonefile.py
+++ b/dns/zonefile.py
@@ -279,31 +279,31 @@ class Reader:
         # Sometimes there are modifiers in the hostname. These come after
         # the dollar sign. They are in the form: ${offset[,width[,base]]}.
         # Make names
+        mod = ""
+        sign = "+"
+        offset = 0
+        width = 0
+        base = "d"
         g1 = is_generate1.match(side)
         if g1:
             mod, sign, offset, width, base = g1.groups()
             if sign == "":
                 sign = "+"
-        g2 = is_generate2.match(side)
-        if g2:
-            mod, sign, offset = g2.groups()
-            if sign == "":
-                sign = "+"
-            width = 0
-            base = "d"
-        g3 = is_generate3.match(side)
-        if g3:
-            mod, sign, offset, width = g3.groups()
-            if sign == "":
-                sign = "+"
-            base = "d"
-
-        if not (g1 or g2 or g3):
-            mod = ""
-            sign = "+"
-            offset = 0
-            width = 0
-            base = "d"
+        else:
+            g2 = is_generate2.match(side)
+            if g2:
+                mod, sign, offset = g2.groups()
+                if sign == "":
+                    sign = "+"
+                width = 0
+                base = "d"
+            else:
+                g3 = is_generate3.match(side)
+                if g3:
+                    mod, sign, offset, width = g3.groups()
+                    if sign == "":
+                        sign = "+"
+                    base = "d"
 
         offset = int(offset)
         width = int(width)