Update pyproject.toml license settings and minimum python version (#191)

Author: Miauwkeru

flow/record/adapter/broker.py

@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING
 
 from flow.broker import Publisher, Subscriber
+
 from flow.record.adapter import AbstractReader, AbstractWriter
 
 if TYPE_CHECKING:

flow/record/adapter/csvfile.py

@@ -118,7 +118,7 @@ def __iter__(self) -> Iterator[Record]:
         ctx = get_app_context()
         selector = self.selector
         for row in self.reader:
-            rdict = dict(zip(self.fields, row))
+            rdict = dict(zip(self.fields, row, strict=False))
             record = self.desc.init_from_dict(rdict)
             if match_record_with_context(record, selector, ctx):
                 yield record

flow/record/adapter/sqlite.py

@@ -192,7 +192,7 @@ def read_table(self, table_name: str) -> Iterator[Record]:
                             row[idx] = None
                         elif isinstance(value, str):
                             row[idx] = value.encode(errors="surrogateescape")
-                yield descriptor_cls.init_from_dict(dict(zip(fnames, row)))
+                yield descriptor_cls.init_from_dict(dict(zip(fnames, row, strict=False)))
 
     def __iter__(self) -> Iterator[Record]:
         """Iterate over all tables in the database and yield records."""

flow/record/adapter/xlsx.py

@@ -144,7 +144,7 @@ def __iter__(self) -> Iterator[Record]:
                         for col in row
                         if col.value and not col.value.startswith("_")
                     ]
-                    desc = record.RecordDescriptor(desc_name, list(zip(field_types, field_names)))
+                    desc = record.RecordDescriptor(desc_name, list(zip(field_types, field_names, strict=False)))
                     continue
 
                 record_values = []

flow/record/base.py

@@ -21,7 +21,6 @@
     TYPE_CHECKING,
     Any,
     BinaryIO,
-    Callable,
 )
 from urllib.parse import parse_qsl, urlparse
 
@@ -60,7 +59,7 @@
 from flow.record.whitelist import WHITELIST, WHITELIST_TREE
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator, Mapping, Sequence
+    from collections.abc import Callable, Iterator, Mapping, Sequence
 
     from flow.record.adapter import AbstractReader, AbstractWriter
 
@@ -1000,7 +999,7 @@ def merge_record_descriptors(
             field_map[fname] = ftype
     if name is None and descriptors:
         name = descriptors[0].name
-    return RecordDescriptor(name, zip(field_map.values(), field_map.keys()))
+    return RecordDescriptor(name, zip(field_map.values(), field_map.keys(), strict=False))
 
 
 def extend_record(

flow/record/context.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 from contextlib import contextmanager
 from contextvars import ContextVar
 from dataclasses import dataclass
@@ -37,15 +36,7 @@ def fresh_app_context() -> Generator[AppContext, None, None]:
         APP_CONTEXT.reset(token)
 
 
-# Use slots=True on dataclass for better performance which requires Python 3.10 or later.
-# This can be removed when we drop support for Python 3.9.
-if sys.version_info >= (3, 10):
-    app_dataclass = dataclass(slots=True)  # novermin
-else:
-    app_dataclass = dataclass
-
-
-@app_dataclass
+@dataclass(slots=True)
 class AppContext:
     """Context for the application, holding metrics like amount of processed records."""
 

flow/record/fieldtypes/net/ip.py

@@ -11,16 +11,15 @@
     ip_interface,
     ip_network,
 )
-from typing import Union
 
 from flow.record.base import FieldType
 from flow.record.fieldtypes import defang
 
-_IPNetwork = Union[IPv4Network, IPv6Network]
-_IPAddress = Union[IPv4Address, IPv6Address]
-_IPInterface = Union[IPv4Interface, IPv6Interface]
-_ConversionTypes = Union[str, int, bytes]
-_IPTypes = Union[_IPNetwork, _IPAddress, _IPInterface]
+_IPNetwork = IPv4Network | IPv6Network
+_IPAddress = IPv4Address | IPv6Address
+_IPInterface = IPv4Interface | IPv6Interface
+_ConversionTypes = str | int | bytes
+_IPTypes = _IPNetwork | _IPAddress | _IPInterface
 
 
 class ipaddress(FieldType):

flow/record/fieldtypes/net/ipv4.py

@@ -29,7 +29,7 @@ def addr_str(s: address | int | str) -> str:
 
 
 def mask_to_bits(n: int) -> int:
-    return bin(n).count("1")
+    return n.bit_count()
 
 
 def bits_to_mask(b: int) -> int:
@@ -51,7 +51,7 @@ def __init__(self, addr: str, netmask: int | None = None):
             raise TypeError(f"Subnet() argument 1 must be string, not {type(addr).__name__}")
 
         if netmask is None:
-            ip, sep, mask = addr.partition("/")
+            ip, _, mask = addr.partition("/")
             self.mask = bits_to_mask(int(mask)) if mask else 0xFFFFFFFF
             self.net = addr_long(ip)
         else:
@@ -93,7 +93,7 @@ def __init__(self):
     def load(self, path: str | Path) -> None:
         with Path(path).open() as fh:
             for line in fh:
-                entry, desc = line.split(" ", 1)
+                entry, _ = line.split(" ", 1)
                 self.subnets.append(subnet(entry))
 
     def add(self, entry: str) -> None:

flow/record/selector.py

@@ -4,14 +4,14 @@
 import ast
 import operator
 import re
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from flow.record.base import GroupedRecord, Record, dynamic_fieldtype
 from flow.record.fieldtypes import net
 from flow.record.whitelist import WHITELIST, WHITELIST_TREE
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
+    from collections.abc import Callable, Iterator
 
 try:
     import astor

flow/record/utils.py

@@ -5,7 +5,10 @@
 import sys
 import warnings
 from functools import wraps
-from typing import Any, BinaryIO, Callable, TextIO
+from typing import TYPE_CHECKING, Any, BinaryIO, TextIO
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
 LOGGING_TRACE_LEVEL = 5