Drop six library (third & last batch) (#3857)

* Drop six library (third & last batch)

* Fix tiny mistake

* Lots and lots of types fixes (+ upg 2 mypy 1.1.1)

---------

Co-authored-by: gpotter2 <[email protected]>

Author: p-l-

.config/mypy/mypy.ini

@@ -2,7 +2,7 @@
 
 # Internal Scapy modules that we ignore
 
-[mypy-scapy.libs.six,scapy.libs.six.moves,scapy.libs.winpcapy]
+[mypy-scapy.libs.winpcapy]
 ignore_errors = True
 ignore_missing_imports = True
 

.config/mypy/mypy_check.py

@@ -101,6 +101,7 @@
             x not in {
                 # Disabled on Windows
                 "scapy/arch/linux.py",
+                "scapy/arch/unix.py",
                 "scapy/arch/solaris.py",
                 "scapy/contrib/cansocket_native.py",
                 "scapy/contrib/isotp/isotp_native_socket.py",
@@ -115,4 +116,4 @@
     os.path.abspath(f) for f in FILES
 ]
 
-mypy_main(None, sys.stdout, sys.stderr, ARGS)
+mypy_main(args=ARGS)

.github/workflows/unittests.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Install tox
         run: pip install tox
       - name: Run mypy

CONTRIBUTING.md

@@ -64,9 +64,9 @@ of function calls, packet creations, etc.).
     is a nice read!
 
 -   Avoid creating unnecessary `list` objects, particularly if they
-    can be huge (e.g., when possible, use `scapy.modules.six.range()` instead of
-    `range()`, `for line in fdesc` instead of `for line in
-    fdesc.readlines()`; more generally prefer generators over lists).
+    can be huge (e.g., when possible, use `for line in fdesc` instead of
+    `for line in fdesc.readlines()`; more generally prefer generators over
+    lists).
 
 ### Tests
 
@@ -146,15 +146,11 @@ The project aims to provide code that works both on Python 2 and Python 3. There
 -   lambdas must be written using a single argument when using tuples: use `lambda x, y: x + f(y)` instead of `lambda (x, y): x + f(y)`.
 -   use int instead of long
 -   use list comprehension instead of map() and filter()
--   use scapy.modules.six.moves.range instead of xrange and range
--   use scapy.modules.six.itervalues(dict) instead of dict.values() or dict.itervalues()
--   use scapy.modules.six.string_types instead of basestring
 -   `__bool__ = __nonzero__` must be used when declaring `__nonzero__` methods
 -   `__next__ = next` must be used when declaring `next` methods in iterators
 -   `StopIteration` must NOT be used in generators (but it can still be used in iterators)
 -   `io.BytesIO` must be used instead of `StringIO` when using bytes
 -   `__cmp__` must not be used.
--   UserDict should be imported via `six.UserDict`
 
 ### Code review
 

scapy/ansmachine.py

@@ -11,6 +11,7 @@
 #  Answering machines  #
 ########################
 
+import abc
 import functools
 import socket
 import warnings
@@ -30,14 +31,13 @@
     Tuple,
     Type,
     TypeVar,
-    _Generic_metaclass,
     cast,
 )
 
 _T = TypeVar("_T", Packet, PacketList)
 
 
-class ReferenceAM(_Generic_metaclass):
+class ReferenceAM(type):
     def __new__(cls,
                 name,  # type: str
                 bases,  # type: Tuple[type, ...]
@@ -142,9 +142,10 @@ def is_request(self, req):
         # type: (Packet) -> int
         return 1
 
+    @abc.abstractmethod
     def make_reply(self, req):
         # type: (Packet) -> _T
-        return req
+        pass
 
     def send_reply(self, reply, send_function=None):
         # type: (_T, Optional[Callable[..., None]]) -> None
@@ -268,4 +269,4 @@ def sniff(self):
 
     def make_reply(self, req, address=None):
         # type: (Packet, Optional[Any]) -> Packet
-        return super(AnsweringMachineTCP, self).make_reply(req)
+        return req

scapy/arch/libpcap.py

@@ -364,7 +364,7 @@ def next(self):
                 float(self.header.contents.ts.tv_usec) / 1e6
             )
             pkt = bytes(bytearray(
-                self.pkt_data[:self.header.contents.len]  # type: ignore
+                self.pkt_data[:self.header.contents.len]
             ))
             return ts, pkt
         __next__ = next
@@ -502,7 +502,7 @@ def __init__(self,
                     self.pcap_fd.setfilter(filter)
 
         def send(self, x):
-            # type: (int) -> NoReturn
+            # type: (Packet) -> NoReturn
             raise Scapy_Exception(
                 "Can't send anything with L2pcapListenSocket"
             )

scapy/arch/windows/__init__.py

@@ -75,7 +75,7 @@
 
 # hot-patching socket for missing variables on Windows
 if not hasattr(socket, 'IPPROTO_IPIP'):
-    socket.IPPROTO_IPIP = 4
+    socket.IPPROTO_IPIP = 4  # type: ignore
 if not hasattr(socket, 'IP_RECVTTL'):
     socket.IP_RECVTTL = 12  # type: ignore
 if not hasattr(socket, 'IPV6_HDRINCL'):
@@ -86,7 +86,7 @@
 if not hasattr(socket, 'SOL_IPV6'):
     socket.SOL_IPV6 = socket.IPPROTO_IPV6  # type: ignore
 if not hasattr(socket, 'IPPROTO_GRE'):
-    socket.IPPROTO_GRE = 47
+    socket.IPPROTO_GRE = 47  # type: ignore
 if not hasattr(socket, 'IPPROTO_AH'):
     socket.IPPROTO_AH = 51
 if not hasattr(socket, 'IPPROTO_ESP'):
@@ -965,8 +965,8 @@ def _route_add_loopback(routes=None,  # type: Optional[List[Any]]
         if iface == conf.loopback_name:
             conf.route.routes.remove(route)
     # Remove conf.loopback_name interface
-    for devname, iface in list(conf.ifaces.items()):
-        if iface == conf.loopback_name:
+    for devname, ifname in list(conf.ifaces.items()):
+        if ifname == conf.loopback_name:
             conf.ifaces.pop(devname)
     # Inject interface
     conf.ifaces["{0XX00000-X000-0X0X-X00X-00XXXX000XXX}"] = adapter

scapy/asn1/asn1.py

@@ -26,12 +26,13 @@
     Optional,
     Tuple,
     Type,
-    TypeVar,
     Union,
-    _Generic_metaclass,
     cast,
     TYPE_CHECKING,
 )
+from typing import (
+    TypeVar,
+)
 
 if TYPE_CHECKING:
     from scapy.asn1.ber import BERcodec_Object
@@ -278,7 +279,7 @@ class ASN1_Class_UNIVERSAL(ASN1_Class):
     TIME_TICKS = cast(ASN1Tag, 3 | 0x40)    # application-specific encoding
 
 
-class ASN1_Object_metaclass(_Generic_metaclass):
+class ASN1_Object_metaclass(type):
     def __new__(cls,
                 name,  # type: str
                 bases,  # type: Tuple[type, ...]

scapy/asn1/ber.py

@@ -39,7 +39,6 @@
     Type,
     TypeVar,
     Union,
-    _Generic_metaclass,
     cast,
 )
 
@@ -263,7 +262,7 @@ def BER_tagging_enc(s, hidden_tag=None, implicit_tag=None, explicit_tag=None):
 #    [ BER classes ]    #
 
 
-class BERcodec_metaclass(_Generic_metaclass):
+class BERcodec_metaclass(type):
     def __new__(cls,
                 name,  # type: str
                 bases,  # type: Tuple[type, ...]

scapy/asn1fields.py

@@ -52,11 +52,13 @@
     Optional,
     Tuple,
     Type,
-    TypeVar,
     Union,
     cast,
     TYPE_CHECKING,
 )
+from typing import (
+    TypeVar,
+)
 
 if TYPE_CHECKING:
     from scapy.asn1packet import ASN1_Packet
@@ -181,7 +183,7 @@ def extract_packet(self,
         try:
             c = cls(s, _underlayer=_underlayer)
         except ASN1F_badsequence:
-            c = packet.Raw(s, _underlayer=_underlayer)
+            c = packet.Raw(s, _underlayer=_underlayer)  # type: ignore
         cpad = c.getlayer(packet.Raw)
         s = b""
         if cpad is not None:
@@ -229,8 +231,8 @@ def __str__(self):
         return repr(self)
 
     def randval(self):
-        # type: () -> RandField[Any]
-        return RandInt()
+        # type: () -> RandField[_I]
+        return cast(RandField[_I], RandInt())
 
 
 ############################
@@ -527,7 +529,7 @@ def __init__(self,
                  ):
         # type: (...) -> None
         if isinstance(cls, type) and issubclass(cls, ASN1F_field):
-            self.fld = cast(Type[ASN1F_field[Any, Any]], cls)
+            self.fld = cls
             self._extract_packet = lambda s, pkt: self.fld(
                 self.name, b"").m2i(pkt, s)
             self.holds_packets = 0
@@ -696,7 +698,6 @@ def __init__(self, name, default, *args, **kwargs):
                 else:
                     self.choices[p.ASN1_root.network_tag] = p
             elif hasattr(p, "ASN1_tag"):
-                p = cast(Union[ASN1F_PACKET, Type[ASN1F_field[Any, Any]]], p)
                 if isinstance(p, type):
                     # should be ASN1F_field class
                     self.choices[int(p.ASN1_tag)] = p
@@ -735,9 +736,8 @@ def m2i(self, pkt, s):
                     )
                 )
         if hasattr(choice, "ASN1_root"):
-            choice = cast('ASN1_Packet', choice)
             # we don't want to import ASN1_Packet in this module...
-            return self.extract_packet(choice, s, _underlayer=pkt)
+            return self.extract_packet(choice, s, _underlayer=pkt)  # type: ignore
         elif isinstance(choice, type):
             return choice(self.name, b"").m2i(pkt, s)
         else:
@@ -767,7 +767,7 @@ def randval(self):
             elif hasattr(p, "ASN1_tag"):
                 if isinstance(p, type):
                     # should be (basic) ASN1F_field class
-                    randchoices.append(p("dummy", None).randval())  # type: ignore
+                    randchoices.append(p("dummy", None).randval())
                 else:
                     # should be ASN1F_PACKET instance
                     randchoices.append(p.randval())
@@ -841,7 +841,7 @@ def i2m(self,
                                implicit_tag=self.implicit_tag,
                                explicit_tag=self.explicit_tag)
 
-    def randval(self):
+    def randval(self):  # type: ignore
         # type: () -> ASN1_Packet
         return packet.fuzz(self.cls())
 
@@ -863,8 +863,10 @@ def __init__(self,
                  ):
         # type: (...) -> None
         self.cls = cls
-        super(ASN1F_BIT_STRING_ENCAPS, self).__init__(
-            name, default and raw(default), context=context,
+        super(ASN1F_BIT_STRING_ENCAPS, self).__init__(  # type: ignore
+            name,
+            default and raw(default),
+            context=context,
             implicit_tag=implicit_tag,
             explicit_tag=explicit_tag
         )

scapy/asn1packet.py

@@ -34,7 +34,10 @@ def __new__(cls,
         # type: (...) -> Type[ASN1_Packet]
         if dct["ASN1_root"] is not None:
             dct["fields_desc"] = dct["ASN1_root"].get_fields_list()
-        return super(ASN1Packet_metaclass, cls).__new__(cls, name, bases, dct)
+        return cast(
+            'Type[ASN1_Packet]',
+            super(ASN1Packet_metaclass, cls).__new__(cls, name, bases, dct),
+        )
 
 
 class ASN1_Packet(Packet, metaclass=ASN1Packet_metaclass):

scapy/automaton.py

@@ -50,7 +50,6 @@
     Type,
     TypeVar,
     Union,
-    _Generic_metaclass,
     cast,
 )
 
@@ -134,7 +133,7 @@ def select_objects(inputs, remain):
 _T = TypeVar("_T")
 
 
-class ObjectPipe(Generic[_T], metaclass=_Generic_metaclass):
+class ObjectPipe(Generic[_T]):
     def __init__(self, name=None):
         # type: (Optional[str]) -> None
         self.name = name or "ObjectPipe"
@@ -626,7 +625,7 @@ def __init__(self,
         self.atmt.runbg()
 
     def send(self, s):
-        # type: (bytes) -> int
+        # type: (Union[bytes, Packet]) -> int
         if not isinstance(s, bytes):
             s = bytes(s)
         return self.spa.send(s)
@@ -694,7 +693,7 @@ def __new__(cls, name, bases, dct):
         while classes:
             c = classes.pop(0)  # order is important to avoid breaking method overloading  # noqa: E501
             classes += list(c.__bases__)
-            for k, v in c.__dict__.items():
+            for k, v in c.__dict__.items():  # type: ignore
                 if k not in members:
                     members[k] = v
 
@@ -902,9 +901,9 @@ def __init__(self,
                      ):
             # type: (...) -> None
             if rd is not None and not isinstance(rd, (int, ObjectPipe)):
-                rd = rd.fileno()  # type: ignore
+                rd = rd.fileno()
             if wr is not None and not isinstance(wr, (int, ObjectPipe)):
-                wr = wr.fileno()  # type: ignore
+                wr = wr.fileno()
             self.rd = rd
             self.wr = wr
 
@@ -998,8 +997,8 @@ class Singlestep(AutomatonStopped):
 
     class InterceptionPoint(AutomatonStopped):
         def __init__(self, msg, state=None, result=None, packet=None):
-            # type: (str, Optional[Message], Optional[str], Optional[str]) -> None  # noqa: E501
-            Automaton.AutomatonStopped.__init__(self, msg, state=state, result=result)  # noqa: E501
+            # type: (str, Optional[Message], Optional[str], Optional[Packet]) -> None
+            Automaton.AutomatonStopped.__init__(self, msg, state=state, result=result)
             self.packet = packet
 
     class CommandMessage(AutomatonException):

scapy/autorun.py

@@ -167,7 +167,7 @@ def autorun_get_interactive_session(cmds, **kargs):
     try:
         try:
             sys.stdout = sys.stderr = sw
-            sys.excepthook = sys.__excepthook__  # type: ignore
+            sys.excepthook = sys.__excepthook__
             res = autorun_commands_timeout(cmds, **kargs)
         except StopAutorun as e:
             e.code_run = sw.s