python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-08-06 22:32:54 +02:00
Code Issues Releases Activity

manually pull scope_id for older python versions

Browse Source
This commit is contained in:
Kelly Brazil
2022-07-28 10:50:03 -07:00
parent 4b245952fe
commit 1fcf844e8d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jc/parsers/ip_address.py
View File

@ -534,17 +534,25 @@ def parse(
if jc.utils.has_data(data): if jc.utils.has_data(data):
SCOPE_PATTERN = re.compile(r'%[a-zA-Z0-9]*[^/]')
# Accept IPs entered as integer notation # Accept IPs entered as integer notation
try: try:
data = int(data) # type: ignore data = int(data) # type: ignore
except Exception: except Exception:
data = data.strip() data = data.strip()
# python versions < 3.9 do not handle the ipv6 scope, so remove it if parsing fails # python versions < 3.9 do not handle the ipv6 scope, so pop it
# and use instead of ipaddress.scope_id if parsing fails
scope_string = None
try: try:
interface = ipaddress.ip_interface(data) interface = ipaddress.ip_interface(data)
except ValueError: except ValueError:
data = re.sub(r'%[a-zA-Z0-9]*[^/]', '', data) scope_match = re.match(SCOPE_PATTERN, data)
if scope_match:
scope_string = scope_match.group(0)
data = re.sub(SCOPE_PATTERN, '', data)
interface = ipaddress.ip_interface(data) interface = ipaddress.ip_interface(data)
network_string = str(interface.network).split('/')[0] network_string = str(interface.network).split('/')[0]
@ -576,7 +584,7 @@ def parse(
try: try:
scope_id = interface.scope_id scope_id = interface.scope_id
except AttributeError: except AttributeError:
pass scope_id = scope_string
ipv4_mapped = str(interface.ipv4_mapped) if interface.ipv4_mapped else None ipv4_mapped = str(interface.ipv4_mapped) if interface.ipv4_mapped else None
sixtofour = str(interface.sixtofour) if interface.sixtofour else None sixtofour = str(interface.sixtofour) if interface.sixtofour else None