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

Refactor pattern check

Browse Source
This commit is contained in:
Ryan Breaker
2017-10-24 20:22:15 -05:00
parent 53f58d4496
commit 3d023126ba
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/utilities/forms.py
View File

@ -89,9 +89,10 @@ def parse_alphanumeric_range(string):
try: try:
begin, end = dash_range.split('-') begin, end = dash_range.split('-')
# Skip if incompatible types or mixed case, just like any other bad pattern # Skip if incompatible types or mixed case, just like any other bad pattern
if (str.isalpha(begin) and str.isdigit(end)) or (str.isdigit(begin) and str.isalpha(end)): vals = begin + end
if not (vals.isdigit() or vals.isalpha()):
continue continue
if not (str.isupper(begin + end) or str.islower(begin + end)): if vals.isalpha() and not (vals.isupper() or vals.islower()):
continue continue
except ValueError: except ValueError:
begin, end = dash_range, dash_range begin, end = dash_range, dash_range