MISP
/
PyMISPWarningLists
mirror of https://github.com/MISP/PyMISPWarningLists
2
0
Fork 0
Code Issues Releases Wiki Activity

fix typing

pull/22/head
Mathieu Beligon 2023-06-22 22:36:41 +02:00
parent a0713f732c
commit efd21177c0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pymispwarninglists/api.py
View File

@ -11,7 +11,7 @@ from glob import glob
from ipaddress import ip_network, IPv6Address, IPv4Address, IPv4Network, IPv6Network, _BaseNetwork, \ from ipaddress import ip_network, IPv6Address, IPv4Address, IPv4Network, IPv6Network, _BaseNetwork, \
AddressValueError, NetmaskValueError AddressValueError, NetmaskValueError
from pathlib import Path from pathlib import Path
from typing import Union, Dict, Any, List, Optional from typing import Union, Dict, Any, List, Optional, Tuple
from urllib.parse import urlparse from urllib.parse import urlparse
from . import tools from . import tools
@ -162,8 +162,8 @@ class WarningLists(Mapping):
class NetworkFilter: class NetworkFilter:
def __init__(self, digit_position: int, digit2filter: Optional[dict[int, Union[bool, "NetworkFilter"]]] = None): def __init__(self, digit_position: int, digit2filter: Optional[Dict[int, Union[bool, "NetworkFilter"]]] = None):
self.digit2filter: dict[int, Union[bool, NetworkFilter]] = digit2filter or {0: False, 1: False} self.digit2filter: Dict[int, Union[bool, NetworkFilter]] = digit2filter or {0: False, 1: False}
self.digit_position = digit_position self.digit_position = digit_position
def __contains__(self, ip: int) -> bool: def __contains__(self, ip: int) -> bool:
@ -199,7 +199,7 @@ class NetworkFilter:
return isinstance(other, NetworkFilter) and self.digit_position == other.digit_position and self.digit2filter == other.digit2filter return isinstance(other, NetworkFilter) and self.digit_position == other.digit_position and self.digit2filter == other.digit2filter
def compile_network_filters(values: list) -> tuple[NetworkFilter, NetworkFilter]: def compile_network_filters(values: list) -> Tuple[NetworkFilter, NetworkFilter]:
networks = convert_networks(values) networks = convert_networks(values)
ipv4_filter = NetworkFilter(31) ipv4_filter = NetworkFilter(31)
@ -212,7 +212,7 @@ def compile_network_filters(values: list) -> tuple[NetworkFilter, NetworkFilter]
return ipv4_filter, ipv6_filter return ipv4_filter, ipv6_filter
def convert_networks(values: list) -> list[_BaseNetwork]: def convert_networks(values: list) -> List[_BaseNetwork]:
valid_ips = [] valid_ips = []
invalid_ips = [] invalid_ips = []