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

fixes for python < 3.9

Browse Source
This commit is contained in:
Kelly Brazil
2022-07-28 10:25:21 -07:00
parent 6625ade578
commit 4bb4cced90
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jc/parsers/ip_address.py
View File

@ -460,6 +460,7 @@ Examples:
} }
""" """
from typing import Dict, Union from typing import Dict, Union
import re
import binascii import binascii
import ipaddress import ipaddress
import jc.utils import jc.utils
@ -539,7 +540,12 @@ def parse(
except Exception: except Exception:
data = data.strip() data = data.strip()
interface = ipaddress.ip_interface(data) # python versions < 3.9 do not handle the ipv6 scope, so remove it if parsing fails
try:
interface = ipaddress.ip_interface(data)
except ValueError:
data = re.sub(r'%[a-zA-Z0-9]*[^/]', data)
interface = ipaddress.ip_interface(data)
network_string = str(interface.network).split('/')[0] network_string = str(interface.network).split('/')[0]
network_cidr = int(str(interface.with_prefixlen).split('/')[1]) network_cidr = int(str(interface.with_prefixlen).split('/')[1])
@ -566,7 +572,12 @@ def parse(
teredo_client = None teredo_client = None
teredo_server = None teredo_server = None
if interface.version == 6: if interface.version == 6:
scope_id = interface.scope_id # scope_id not available in python version < 3.9
try:
scope_id = interface.scope_id
except AttributeError:
pass
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
teredo_client = str(interface.teredo[1]) if interface.teredo else None teredo_client = str(interface.teredo[1]) if interface.teredo else None