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

fix: Make mypy happy, few syntax changes

pull/24/head
Raphaël Vinot 2023-06-26 15:56:51 +02:00
parent b9239ae3d0
commit 21004dc888
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pymispwarninglists/api.py
View File

@ -8,10 +8,10 @@ import sys
from collections.abc import Mapping from collections.abc import Mapping
from contextlib import suppress from contextlib import suppress
from glob import glob from glob import glob
from ipaddress import ip_network, IPv6Address, IPv4Address, IPv4Network, IPv6Network, _BaseNetwork, \ from ipaddress import ip_network, IPv6Address, IPv4Address, IPv4Network, _BaseNetwork, \
AddressValueError, NetmaskValueError AddressValueError, NetmaskValueError
from pathlib import Path from pathlib import Path
from typing import Union, Dict, Any, List, Optional, Tuple from typing import Union, Dict, Any, List, Optional, Tuple, Sequence
from urllib.parse import urlparse from urllib.parse import urlparse
from . import tools from . import tools
@ -32,7 +32,6 @@ def json_default(obj: 'WarningList') -> Union[Dict, str]:
return obj.to_dict() return obj.to_dict()
class WarningList(): class WarningList():
expected_types = ['string', 'substring', 'hostname', 'cidr', 'regex'] expected_types = ['string', 'substring', 'hostname', 'cidr', 'regex']
@ -189,7 +188,7 @@ class NetworkFilter:
if child is not True: if child is not True:
child.append(net) child.append(net)
def _get_digit(self, ip:int) -> int: def _get_digit(self, ip: int) -> int:
return (ip >> self.digit_position) & 1 return (ip >> self.digit_position) & 1
def __repr__(self): def __repr__(self):
@ -212,7 +211,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) -> Sequence[_BaseNetwork]:
valid_ips = [] valid_ips = []
invalid_ips = [] invalid_ips = []

5
tests/tests.py
View File

@ -6,7 +6,7 @@ import os
import unittest import unittest
from glob import glob from glob import glob
from ipaddress import IPv4Network from ipaddress import IPv4Network
from pymispwarninglists import WarningLists, tools, WarningList from pymispwarninglists import WarningLists, tools, WarningList
from pymispwarninglists.api import compile_network_filters, NetworkFilter from pymispwarninglists.api import compile_network_filters, NetworkFilter
@ -63,6 +63,9 @@ class TestPyMISPWarningLists(unittest.TestCase):
class TestCidrList(unittest.TestCase): class TestCidrList(unittest.TestCase):
cidr_list: WarningList
@classmethod @classmethod
def setUpClass(cls) -> None: def setUpClass(cls) -> None:
cls.cidr_list = WarningList( cls.cidr_list = WarningList(