Improve typing slightly

Author: gpotter2

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = [ "setuptools>=62.0.0" ]
+requires = [ "setuptools>=77.0.0" ]
 build-backend = "setuptools.build_meta"
 
 [project]

scapy/layers/l2.py

@@ -895,14 +895,14 @@ def arpcachepoison(
 
 @conf.commands.register
 def arp_mitm(
-    ip1,  # type: str
-    ip2,  # type: str
+    ip1: str,
+    ip2: str,
     mac1=None,  # type: Optional[Union[str, List[str]]]
     mac2=None,  # type: Optional[Union[str, List[str]]]
-    broadcast=False,  # type: bool
-    target_mac=None,  # type: Optional[str]
-    iface=None,  # type: Optional[_GlobInterfaceType]
-    inter=3,  # type: int
+    broadcast: bool = False,
+    target_mac: Optional[str] = None,
+    iface: Optional[_GlobInterfaceType] = None,
+    inter: int = 3,
 ):
     # type: (...) -> None
     r"""ARP MitM: poison 2 target's ARP cache

scapy/layers/smbclient.py

@@ -1126,7 +1126,7 @@ def __init__(
         guest: bool = False,
         kerberos: bool = True,
         kerberos_required: bool = False,
-        HashNt: str = None,
+        HashNt: bytes = None,
         port: int = 445,
         timeout: int = 2,
         debug: int = 0,

scapy/utils.py

@@ -3900,13 +3900,26 @@ def AutoArgparse(func: DecoratorCallable) -> None:
             continue
         parname = param.name
         paramkwargs = {}
-        if param.annotation is bool:
+        paramtype = param.annotation
+        # Process types we don't know
+        if paramtype not in [bool, str, int, float]:
+            try:
+                if paramtype.__origin__ is Union:
+                    # Handles Optional[] and Union[]
+                    paramtype = next(
+                        x for x in paramtype.__args__
+                        if x in [bool, str, int, float]
+                    )
+            except Exception:
+                pass
+        # Process the types we know
+        if paramtype is bool:
             if param.default is True:
                 parname = "no-" + parname
                 paramkwargs["action"] = "store_false"
             else:
                 paramkwargs["action"] = "store_true"
-        elif param.annotation in [str, int, float]:
+        elif paramtype in [str, int, float]:
             paramkwargs["type"] = param.annotation
         else:
             continue