Parcourir la source

Fixes #25: Recurse expand_pattern only if there are more ranges to unpack

Jeremy Stretch il y a 8 ans
Parent
commit
eade3cbd6b
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      netbox/utilities/forms.py

+ 2 - 2
netbox/utilities/forms.py

@@ -19,11 +19,11 @@ def expand_pattern(string):
     lead, pattern, remnant = re.split(EXPANSION_PATTERN, string, maxsplit=1)
     lead, pattern, remnant = re.split(EXPANSION_PATTERN, string, maxsplit=1)
     x, y = pattern.split('-')
     x, y = pattern.split('-')
     for i in range(int(x), int(y) + 1):
     for i in range(int(x), int(y) + 1):
-        if remnant:
+        if re.search(EXPANSION_PATTERN, remnant):
             for string in expand_pattern(remnant):
             for string in expand_pattern(remnant):
                 yield "{}{}{}".format(lead, i, string)
                 yield "{}{}{}".format(lead, i, string)
         else:
         else:
-            yield "{}{}".format(lead, i)
+            yield "{}{}{}".format(lead, i, remnant)
 
 
 
 
 #
 #