apply com2ann

pipx run com2ann --python-minor-version=6 -s src
mgorny · Mar 1, 2021 · fa6d53b · fa6d53b
1 parent cc50c36
commit fa6d53b
Show file tree

Hide file tree

Showing 134 changed files with 325 additions and 327 deletions.
diff --git a/src/twisted/application/internet.py b/src/twisted/application/internet.py
@@ -72,7 +72,7 @@ def _maybeGlobalReactor(maybeReactor):
 
 class _VolatileDataService(service.Service):
 
-    volatile = []  # type: List[str]
+    volatile: List[str] = []
 
     def __getstate__(self):
         d = service.Service.__getstate__(self)
@@ -100,7 +100,7 @@ class _AbstractServer(_VolatileDataService):
     """
 
     volatile = ["_port"]
-    method = ""  # type: str
+    method: str = ""
     reactor = None
 
     _port = None
@@ -163,7 +163,7 @@ class _AbstractClient(_VolatileDataService):
     """
 
     volatile = ["_connection"]
-    method = ""  # type: str
+    method: str = ""
     reactor = None
 
     _connection = None

diff --git a/src/twisted/application/runner/test/test_runner.py b/src/twisted/application/runner/test/test_runner.py
@@ -217,7 +217,7 @@ def test_startLogging(self) -> None:
         # running (started by trial) logging system.
 
         class LogBeginner:
-            observers = []  # type: List[ILogObserver]
+            observers: List[ILogObserver] = []
 
             def beginLoggingTo(self, observers: Iterable[ILogObserver]) -> None:
                 LogBeginner.observers = list(observers)
@@ -227,8 +227,8 @@ def beginLoggingTo(self, observers: Iterable[ILogObserver]) -> None:
         # Patch FilteringLogObserver so we can capture its arguments
 
         class MockFilteringLogObserver(FilteringLogObserver):
-            observer = None  # type: Optional[ILogObserver]
-            predicates = []  # type: List[LogLevelFilterPredicate]
+            observer: Optional[ILogObserver] = None
+            predicates: List[LogLevelFilterPredicate] = []
 
             def __init__(
                 self,
@@ -247,7 +247,7 @@ def __init__(
         # Patch FileLogObserver so we can capture its arguments
 
         class MockFileLogObserver(FileLogObserver):
-            outFile = None  # type: Optional[TextIO]
+            outFile: Optional[TextIO] = None
 
             def __init__(self, outFile: TextIO) -> None:
                 MockFileLogObserver.outFile = outFile
@@ -426,7 +426,7 @@ class DummyKill:
     """
 
     def __init__(self) -> None:
-        self.calls = []  # type: List[Tuple[int, int]]
+        self.calls: List[Tuple[int, int]] = []
 
     def __call__(self, pid: int, sig: int) -> None:
         self.calls.append((pid, sig))

diff --git a/src/twisted/application/twist/test/test_options.py b/src/twisted/application/twist/test/test_options.py
@@ -45,7 +45,7 @@ def patchOpen(self) -> None:
         """
         Patch L{_options.open} so we can capture usage and prevent actual opens.
         """
-        self.opened = []  # type: List[Tuple[str, Optional[str]]]
+        self.opened: List[Tuple[str, Optional[str]]] = []
 
         def fakeOpen(name: str, mode: Optional[str] = None) -> object:
             if name == "nocanopen":
@@ -61,7 +61,7 @@ def patchInstallReactor(self) -> None:
         Patch C{_options.installReactor} so we can capture usage and prevent
         actual installs.
         """
-        self.installedReactors = {}  # type: Dict[str, IReactorCore]
+        self.installedReactors: Dict[str, IReactorCore] = {}
 
         def installReactor(name: str) -> IReactorCore:
             if name != "fusion":

diff --git a/src/twisted/application/twist/test/test_twist.py b/src/twisted/application/twist/test/test_twist.py
@@ -43,7 +43,7 @@ def patchInstallReactor(self) -> None:
         Patch C{_options.installReactor} so we can capture usage and prevent
         actual installs.
         """
-        self.installedReactors = {}  # type: Dict[str, IReactorCore]
+        self.installedReactors: Dict[str, IReactorCore] = {}
 
         def installReactor(_: TwistOptions, name: str) -> IReactorCore:
             reactor = MemoryReactor()
@@ -57,7 +57,7 @@ def patchStartService(self) -> None:
         Patch L{MultiService.startService} so we can capture usage and prevent
         actual starts.
         """
-        self.serviceStarts = []  # type: List[IService]
+        self.serviceStarts: List[IService] = []
 
         def startService(service: IService) -> None:
             self.serviceStarts.append(service)

diff --git a/src/twisted/conch/client/options.py b/src/twisted/conch/client/options.py
@@ -11,7 +11,7 @@
 
 class ConchOptions(usage.Options):
 
-    optParameters = [
+    optParameters: List[List[Optional[Union[str, int]]]] = [
         ["user", "l", None, "Log in using this user name."],
         ["identity", "i", None],
         ["ciphers", "c", None],
@@ -22,7 +22,7 @@ class ConchOptions(usage.Options):
         ["known-hosts", "", None, "File to check for host keys"],
         ["user-authentications", "", None, "Types of user authentications to use."],
         ["logfile", "", None, "File to log to, or - for stdout"],
-    ]  # type: List[List[Optional[Union[str, int]]]]
+    ]
 
     optFlags = [
         ["version", "V", "Display version number only."],

diff --git a/src/twisted/conch/manhole_ssh.py b/src/twisted/conch/manhole_ssh.py
@@ -141,8 +141,8 @@ def requestAvatar(self, avatarId, mind, *interfaces):
 
 
 class ConchFactory(factory.SSHFactory):
-    publicKeys = {}  # type: Dict[bytes, bytes]
-    privateKeys = {}  # type: Dict[bytes, bytes]
+    publicKeys: Dict[bytes, bytes] = {}
+    privateKeys: Dict[bytes, bytes] = {}
 
     def __init__(self, portal):
         self.portal = portal
diff --git a/src/twisted/conch/recvline.py b/src/twisted/conch/recvline.py
@@ -19,7 +19,7 @@
 from twisted.python.compat import iterbytes
 from twisted.logger import Logger
 
-_counters = {}  # type: Dict[str, int]
+_counters: Dict[str, int] = {}
 
 
 class Logging:

diff --git a/src/twisted/conch/scripts/cftp.py b/src/twisted/conch/scripts/cftp.py
@@ -37,12 +37,12 @@ class ClientOptions(options.ConchOptions):
         "executing commands to send and receive file information"
     )
 
-    optParameters = [
+    optParameters: List[List[Optional[Union[str, int]]]] = [
         ["buffersize", "B", 32768, "Size of the buffer to use for sending/receiving."],
         ["batchfile", "b", None, "File to read commands from, or '-' for stdin."],
         ["requests", "R", 5, "Number of requests to make before waiting for a reply."],
         ["subsystem", "s", "sftp", "Subsystem/server program to connect to."],
-    ]  # type: List[List[Optional[Union[str, int]]]]
+    ]
 
     compData = usage.Completions(
         descriptions={"buffersize": "Size of send/receive buffer (default: 32768)"},

diff --git a/src/twisted/conch/scripts/conch.py b/src/twisted/conch/scripts/conch.py
@@ -75,8 +75,8 @@ class ClientOptions(ConchOptions):
         ],
     )
 
-    localForwards = []  # type: List[Tuple[int, Tuple[int, int]]]
-    remoteForwards = []  # type: List[Tuple[int, Tuple[int, int]]]
+    localForwards: List[Tuple[int, Tuple[int, int]]] = []
+    remoteForwards: List[Tuple[int, Tuple[int, int]]] = []
 
     def opt_escape(self, esc):
         """

diff --git a/src/twisted/conch/scripts/tkconch.py b/src/twisted/conch/scripts/tkconch.py
@@ -271,9 +271,9 @@ class GeneralOptions(usage.Options):
         ],
     )
 
-    identitys = []  # type: List[str]
-    localForwards = []  # type: List[Tuple[int, Tuple[int, int]]]
-    remoteForwards = []  # type: List[Tuple[int, Tuple[int, int]]]
+    identitys: List[str] = []
+    localForwards: List[Tuple[int, Tuple[int, int]]] = []
+    remoteForwards: List[Tuple[int, Tuple[int, int]]] = []
 
     def opt_identity(self, i):
         self.identitys.append(i)
@@ -499,7 +499,7 @@ def connectionSecure(self):
 
 
 class SSHUserAuthClient(userauth.SSHUserAuthClient):
-    usedFiles = []  # type: List[str]
+    usedFiles: List[str] = []
 
     def getPassword(self, prompt=None):
         if not prompt:

diff --git a/src/twisted/conch/ssh/channel.py b/src/twisted/conch/ssh/channel.py
@@ -52,7 +52,7 @@ class SSHChannel(log.Logger):
     """
 
     _log = Logger()
-    name = None  # type: bytes  # only needed for client channels
+    name: bytes = None  # only needed for client channels
 
     def __init__(
         self,

diff --git a/src/twisted/conch/ssh/filetransfer.py b/src/twisted/conch/ssh/filetransfer.py
@@ -24,7 +24,7 @@ class FileTransferBase(protocol.Protocol):
 
     versions = (3,)
 
-    packetTypes = {}  # type: Dict[int, str]
+    packetTypes: Dict[int, str] = {}
 
     def __init__(self):
         self.buf = b""

diff --git a/src/twisted/conch/ssh/service.py b/src/twisted/conch/ssh/service.py
@@ -13,8 +13,8 @@
 
 
 class SSHService:
-    name = None  # type: bytes  # this is the ssh name for the service
-    protocolMessages = {}  # type: Dict[int, str]  # map #'s -> protocol names
+    name: bytes = None  # this is the ssh name for the service
+    protocolMessages: Dict[int, str] = {}  # map #'s -> protocol names
     transport = None  # gets set later
 
     _log = Logger()

diff --git a/src/twisted/conch/test/test_insults.py b/src/twisted/conch/test/test_insults.py
@@ -218,7 +218,7 @@ def testByte%(groupName)s(self):
 
 
 class ByteGroupingsMixin(MockMixin):
-    protocolFactory = None  # type: Optional[Type[Protocol]]
+    protocolFactory: Optional[Type[Protocol]] = None
 
     for word, n in [
         ("Pairs", 2),

diff --git a/src/twisted/conch/test/test_manhole.py b/src/twisted/conch/test/test_manhole.py
@@ -11,7 +11,7 @@
 import traceback
 from typing import Optional
 
-ssh = None  # type: Optional[bool]
+ssh: Optional[bool] = None
 
 from twisted.trial import unittest
 from twisted.internet import error, defer

diff --git a/src/twisted/conch/test/test_transport.py b/src/twisted/conch/test/test_transport.py
@@ -365,7 +365,7 @@ class TransportTestCase(TestCase):
     Base class for transport test cases.
     """
 
-    klass = None  # type: Optional[Type[transport.SSHTransportBase]]
+    klass: Optional[Type[transport.SSHTransportBase]] = None
 
     if dependencySkip:
         skip = dependencySkip
@@ -462,7 +462,7 @@ class BaseSSHTransportBaseCase:
     Base case for TransportBase tests.
     """
 
-    klass = MockTransportBase  # type: Optional[Type[transport.SSHTransportBase]]
+    klass: Optional[Type[transport.SSHTransportBase]] = MockTransportBase
 
 
 class BaseSSHTransportTests(BaseSSHTransportBaseCase, TransportTestCase):
@@ -1366,9 +1366,7 @@ class ServerSSHTransportBaseCase(ServerAndClientSSHTransportBaseCase):
     Base case for SSHServerTransport tests.
     """
 
-    klass = (
-        transport.SSHServerTransport
-    )  # type: Optional[Type[transport.SSHTransportBase]]
+    klass: Optional[Type[transport.SSHTransportBase]] = transport.SSHServerTransport
 
     def setUp(self):
         TransportTestCase.setUp(self)
@@ -1921,9 +1919,7 @@ class ClientSSHTransportBaseCase(ServerAndClientSSHTransportBaseCase):
     Base case for SSHClientTransport tests.
     """
 
-    klass = (
-        transport.SSHClientTransport
-    )  # type: Optional[Type[transport.SSHTransportBase]]
+    klass: Optional[Type[transport.SSHTransportBase]] = transport.SSHClientTransport
 
     def verifyHostKey(self, pubKey, fingerprint):
         """

diff --git a/src/twisted/conch/test/test_userauth.py b/src/twisted/conch/test/test_userauth.py
@@ -23,7 +23,7 @@
 from twisted.python.reflect import requireModule
 from twisted.trial import unittest
 
-keys = None  # type: Optional[ModuleType]
+keys: Optional[ModuleType] = None
 if requireModule("cryptography") and requireModule("pyasn1"):
     from twisted.conch.ssh.common import NS
     from twisted.conch.checkers import SSHProtocolChecker

diff --git a/src/twisted/cred/strcred.py b/src/twisted/cred/strcred.py
@@ -142,7 +142,7 @@ class AuthOptionMixin:
         will send all help-related output. Default: L{sys.stdout}
     """
 
-    supportedInterfaces = None  # type: Optional[Sequence[Type[Interface]]]
+    supportedInterfaces: Optional[Sequence[Type[Interface]]] = None
     authOutput = sys.stdout
 
     def supportsInterface(self, interface):

diff --git a/src/twisted/cred/test/test_strcred.py b/src/twisted/cred/test/test_strcred.py
@@ -564,7 +564,7 @@ class OptionsSupportsAllInterfaces(usage.Options, strcred.AuthOptionMixin):
 
 
 class OptionsSupportsNoInterfaces(usage.Options, strcred.AuthOptionMixin):
-    supportedInterfaces = []  # type: Sequence[Type[Interface]]
+    supportedInterfaces: Sequence[Type[Interface]] = []
 
 
 class LimitingInterfacesTests(TestCase):

diff --git a/src/twisted/internet/_baseprocess.py b/src/twisted/internet/_baseprocess.py
@@ -21,8 +21,8 @@
 
 
 class BaseProcess:
-    pid = None  # type: Optional[int]
-    status = None  # type: Optional[int]
+    pid: Optional[int] = None
+    status: Optional[int] = None
     lostProcess = 0
     proto = None
 

diff --git a/src/twisted/internet/_producer_helpers.py b/src/twisted/internet/_producer_helpers.py
@@ -16,7 +16,7 @@
 
 
 # This module exports nothing public, it's for internal Twisted use only.
-__all__ = []  # type: List[str]
+__all__: List[str] = []
 
 
 @implementer(IPushProducer)

diff --git a/src/twisted/internet/abstract.py b/src/twisted/internet/abstract.py
@@ -186,7 +186,7 @@ def __init__(self, reactor: Optional[interfaces.IReactorFDSet] = None):
             reactor = _reactor  # type: ignore[assignment]
         self.reactor = reactor
         # will be added to dataBuffer in doWrite
-        self._tempDataBuffer = []  # type: List[bytes]
+        self._tempDataBuffer: List[bytes] = []
         self._tempDataLen = 0
 
     def connectionLost(self, reason):

diff --git a/src/twisted/internet/address.py b/src/twisted/internet/address.py
@@ -106,9 +106,9 @@ class UNIXAddress:
     @type name: C{bytes}
     """
 
-    name = attr.ib(
+    name: Optional[bytes] = attr.ib(
         converter=attr.converters.optional(_asFilesystemBytes)
-    )  # type: Optional[bytes]
+    )
 
     if getattr(os.path, "samefile", None) is not None:
 

diff --git a/src/twisted/internet/asyncioreactor.py b/src/twisted/internet/asyncioreactor.py
@@ -49,7 +49,7 @@ class AsyncioSelectorReactor(PosixReactorBase):
 
     def __init__(self, eventloop: Optional[SelectorEventLoop] = None):
         if eventloop is None:
-            _eventloop = get_event_loop()  # type: AbstractEventLoop
+            _eventloop: AbstractEventLoop = get_event_loop()
         else:
             _eventloop = eventloop
 
@@ -59,9 +59,9 @@ def __init__(self, eventloop: Optional[SelectorEventLoop] = None):
         if not isinstance(_eventloop, SelectorEventLoop):
             raise TypeError(f"SelectorEventLoop required, instead got: {_eventloop}")
 
-        self._asyncioEventloop = _eventloop  # type: SelectorEventLoop
-        self._writers = {}  # type: Dict[Type[FileDescriptor], int]
-        self._readers = {}  # type: Dict[Type[FileDescriptor], int]
+        self._asyncioEventloop: SelectorEventLoop = _eventloop
+        self._writers: Dict[Type[FileDescriptor], int] = {}
+        self._readers: Dict[Type[FileDescriptor], int] = {}
         self._continuousPolling = _ContinuousPolling(self)
 
         self._scheduledAt = None