From 665ea402f68800e82a06eae352ddf31acf1fe45b Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 28 Feb 2024 11:59:21 -0600 Subject: [PATCH] Clean up logic --- netbox/utilities/forms/utils.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/netbox/utilities/forms/utils.py b/netbox/utilities/forms/utils.py index 1bd967b06..6ea25b8e7 100644 --- a/netbox/utilities/forms/utils.py +++ b/netbox/utilities/forms/utils.py @@ -60,29 +60,28 @@ def parse_alphanumeric_range(string): return [] except ValueError: begin, end = dash_range, dash_range + + # Value-based if begin == end: values.append(begin) + # Numeric range-based elif begin.isdigit() and end.isdigit(): if int(begin) >= int(end): raise forms.ValidationError(_('Range "{value}" is invalid.').format(value=dash_range)) for n in list(range(int(begin), int(end) + 1)): values.append(n) + # Range-based else: - # Value-based - if begin == end: - values.append(begin) - # Range-based - else: - # Not a valid range (more than a single character) - if not len(begin) == len(end) == 1: - raise forms.ValidationError(_('Range "{value}" is invalid.').format(value=dash_range)) + # Not a valid range (more than a single character) + if not len(begin) == len(end) == 1: + raise forms.ValidationError(_('Range "{value}" is invalid.').format(value=dash_range)) - if ord(begin) >= ord(end): - raise forms.ValidationError(_('Range "{value}" is invalid.').format(value=dash_range)) + if ord(begin) >= ord(end): + raise forms.ValidationError(_('Range "{value}" is invalid.').format(value=dash_range)) - for n in list(range(ord(begin), ord(end) + 1)): - values.append(chr(n)) + for n in list(range(ord(begin), ord(end) + 1)): + values.append(chr(n)) return values