mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

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

Browse Source
This commit is contained in:
Jeremy Stretch
2016-06-27 14:12:30 -04:00
parent 7cf437e11b
commit eade3cbd6b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/utilities/forms.py
View File

@ -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)
# #