Revent Packet, fix Enum annotation

Author: marci07iq

scapy/arch/linux/rtnetlink.py

@@ -394,7 +394,7 @@ def default_payload_class(self, payload: bytes) -> Type[Packet]:
 
 class ifinfomsg(Packet):
     fields_desc = [
-        ByteEnumField("ifi_family", 0, socket.AddressFamily),  # type: ignore
+        ByteEnumField("ifi_family", 0, socket.AddressFamily),
         ByteField("res", 0),
         Field("ifi_type", 0, fmt="=H"),
         Field("ifi_index", 0, fmt="=i"),
@@ -483,7 +483,7 @@ def default_payload_class(self, payload: bytes) -> Type[Packet]:
 
 class ifaddrmsg(Packet):
     fields_desc = [
-        ByteEnumField("ifa_family", 0, socket.AddressFamily),  # type: ignore
+        ByteEnumField("ifa_family", 0, socket.AddressFamily),
         ByteField("ifa_prefixlen", 0),
         FlagsField(
             "ifa_flags",
@@ -607,7 +607,7 @@ def default_payload_class(self, payload: bytes) -> Type[Packet]:
 
 class rtmsg(Packet):
     fields_desc = [
-        ByteEnumField("rtm_family", 0, socket.AddressFamily),  # type: ignore
+        ByteEnumField("rtm_family", 0, socket.AddressFamily),
         ByteField("rtm_dst_len", 0),
         ByteField("rtm_src_len", 0),
         ByteField("rtm_tos", 0),

scapy/base_classes.py

@@ -463,7 +463,7 @@ def __call__(cls,
                  *args,  # type: Any
                  **kargs  # type: Any
                  ):
-        # type: (...) -> 'cls'
+        # type: (...) -> 'Packet'
         if "dispatch_hook" in cls.__dict__:
             try:
                 cls = cls.dispatch_hook(*args, **kargs)

scapy/fields.py

@@ -2647,7 +2647,7 @@ class CharEnumField(EnumField[str]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: str
-                 enum,  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum,  # type: Union[Dict[str, str], Dict[str, str], List[str], DADict[str, str], Type[Enum], Tuple[Callable[[str], str], Callable[[str], str]]]  # noqa: E501
                  fmt="1s",  # type: str
                  ):
         # type: (...) -> None
@@ -2674,7 +2674,7 @@ def __init__(self,
                  name,  # type: str
                  default,  # type:  Optional[int]
                  size,  # type:  int
-                 enum,  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum,  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  **kwargs  # type: Any
                  ):
         # type: (...) -> None
@@ -2700,7 +2700,7 @@ def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
                  length_from,  # type: Callable[[Packet], int]
-                 enum,  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum,  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  **kwargs,  # type: Any
                  ):
         # type: (...) -> None
@@ -2725,7 +2725,7 @@ class ShortEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum,  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum,  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(ShortEnumField, self).__init__(name, default, enum, "H")
@@ -2735,7 +2735,7 @@ class LEShortEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(LEShortEnumField, self).__init__(name, default, enum, "<H")
@@ -2745,7 +2745,7 @@ class LongEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(LongEnumField, self).__init__(name, default, enum, "Q")
@@ -2755,7 +2755,7 @@ class LELongEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(LELongEnumField, self).__init__(name, default, enum, "<Q")
@@ -2765,7 +2765,7 @@ class ByteEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(ByteEnumField, self).__init__(name, default, enum, "B")
@@ -2791,7 +2791,7 @@ class IntEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(IntEnumField, self).__init__(name, default, enum, "I")
@@ -2801,7 +2801,7 @@ class SignedIntEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(SignedIntEnumField, self).__init__(name, default, enum, "i")
@@ -2811,7 +2811,7 @@ class LEIntEnumField(EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         super(LEIntEnumField, self).__init__(name, default, enum, "<I")
@@ -2829,7 +2829,7 @@ class LE3BytesEnumField(LEThreeBytesField, _EnumField[int]):
     def __init__(self,
                  name,  # type: str
                  default,  # type: Optional[int]
-                 enum  # type: Union[Dict[I, str], Dict[str, I], List[str], DADict[I, str], Type[Enum], Tuple[Callable[[I], str], Callable[[str], I]]]  # noqa: E501
+                 enum  # type: Union[Dict[int, str], Dict[str, int], List[str], DADict[int, str], Type[Enum], Tuple[Callable[[int], str], Callable[[str], int]]]  # noqa: E501
                  ):
         # type: (...) -> None
         _EnumField.__init__(self, name, default, enum)