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

2016-06-27 14:12:30 -04:00 · 2016-06-27 14:12:30 -04:00 · eade3cbd6b
parent 7cf437e11b
commit eade3cbd6b
1 changed files with 2 additions and 2 deletions
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@ -19,11 +19,11 @@ def expand_pattern(string):
    lead, pattern, remnant = re.split(EXPANSION_PATTERN, string, maxsplit=1)
    x, y = pattern.split('-')
    for i in range(int(x), int(y) + 1):
-        if remnant:
+        if re.search(EXPANSION_PATTERN, remnant):
            for string in expand_pattern(remnant):
                yield "{}{}{}".format(lead, i, string)
        else:
-            yield "{}{}".format(lead, i)
+            yield "{}{}{}".format(lead, i, remnant)


 #