Merge branch 'trunk' into fix-chat-example

Author: adiroiban

.github/workflows/test.yaml

@@ -134,6 +134,21 @@ jobs:
           # Just Python 3.11 with default settings.
           - python-version: '3.11'
 
+          # Just Python 3.13 alpha with default settings.
+          # For now, no dependencies as cffi doesn't work on 3.13.
+          # No coverage also.
+          - python-version: '3.13.0-alpha.3'
+            tox-env: 'nodeps-nocov-posix'
+            job-name: 'nodeps-nocov-3.13'
+            skip-coverage: yes
+            # FIXME:https://github.com/twisted/twisted/issues/12060
+            # Also add twisted.python
+            # FIXME:https://github.com/twisted/twisted/issues/12061
+            # Add full twisted.internet
+            # FIXME:https://github.com/twisted/twisted/issues/12062
+            # Add full twisted.test
+            trial-target: 'twisted.conch twisted.cred twisted.logger twisted.mail twisted.names twisted.pair twisted.persisted twisted.protocols twisted.runner twisted.spread twisted.test.test_defer twisted.trial twisted.words'
+
           # Newest macOS and oldest Python (major) supported versions.
           - python-version: '3.8'
             runs-on: 'macos-12'
@@ -168,7 +183,7 @@ jobs:
           # extension.
           # There is very little PYPY specific code so there is not much to
           # gain from reporting coverage.
-          - python-version: 'pypy3.10-v7.3.13'
+          - python-version: 'pypy3.10-v7.3.14'
             tox-env: 'alldeps-nocov-posix'
             job-name: 'no-coverage'
             skip-coverage: yes
@@ -194,7 +209,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true

pyproject.toml

@@ -126,8 +126,8 @@ gtk-platform = [
 
 mypy = [
     "twisted[dev,all-non-platform]",
-    "mypy~=1.5.1",
-    "mypy-zope~=1.0.1",
+    "mypy~=1.8",
+    "mypy-zope~=1.0.3",
     "types-setuptools",
     "types-pyOpenSSL",
 ]
@@ -313,6 +313,80 @@ strict_equality = false
 no_implicit_reexport = false
 # Disable some checks until the effected modules fully adopt mypy
 
+[[tool.mypy.overrides]]
+ignore_missing_imports = true
+follow_imports = "silent"
+follow_imports_for_stubs = true
+module = [
+
+  # pyobjc is not installed on linux
+  "CFNetwork",
+  "CoreFoundation",
+
+  # neither is pywin32
+  "pywintypes",
+  "win32api",
+  "win32con",
+  "win32com.*",
+  "win32event",
+  "win32file",
+  "win32pipe",
+  "win32process",
+  "win32security",
+  "win32console",
+
+  # pyserial is very optional
+  "serial",
+  "serial.*",
+
+  # GObject Introspection too
+  "gi",
+  "gi.repository.*",
+
+  # we need to clean this up, because it's ancient and probably unsupported,
+  # but as long as it's still imported, we don't want to type-check it
+  "gobject",
+  "pygtk",
+  "gtk",
+
+  # and wxPython
+  "wxPython.wx",
+  "wx",
+
+  # constantly doesn't have type stubs yet
+  "constantly",
+
+  # h2 doesn't have types yet and is optional besides
+  "h2.*",
+  "hpack.*",
+  "priority",
+
+  # subunit is untyped
+  "subunit",
+
+  # oh this is fun, not even totally sure what library this is, since it's not
+  # documented as an extra.
+  "utmp",
+
+  # automat is not typed, or typeable, at least until
+  # https://github.com/glyph/automat/pull/137 is landed
+  "automat",
+
+  # I think only used by `twisted.web.script.ResourceTemplate`
+  "quixote",
+
+  "cython_test_exception_raiser",
+
+  # various obscure database modules you shouldn't need installed in order to
+  # type-check
+  "pyPgSQL",
+  "psycopg",
+  "MySQLdb",
+  "kinterbasdb",
+
+  "SOAPpy",
+]
+
 [[tool.mypy.overrides]]
 allow_untyped_defs = true
 check_untyped_defs = false

src/twisted/application/internet.py

@@ -41,7 +41,7 @@
 from random import random as _goodEnoughRandom
 from typing import List
 
-from automat import MethodicalMachine  # type: ignore[import]
+from automat import MethodicalMachine
 
 from twisted.application import service
 from twisted.internet import task

src/twisted/application/runner/_runner.py

@@ -12,7 +12,7 @@
 from typing import Any, Callable, Mapping, TextIO
 
 from attr import Factory, attrib, attrs
-from constantly import NamedConstant  # type: ignore[import]
+from constantly import NamedConstant
 
 from twisted.internet.interfaces import IReactorCore
 from twisted.logger import (

src/twisted/conch/test/test_keys.py

@@ -1675,8 +1675,8 @@ def test_providedArguments(self):
         tempDir = FilePath(self.mktemp())
         keyFile = tempDir.child("mykey.pem")
 
-        key = keys._getPersistentRSAKey(keyFile, keySize=512)
-        self.assertEqual(key.size(), 512)
+        key = keys._getPersistentRSAKey(keyFile, keySize=1024)
+        self.assertEqual(key.size(), 1024)
         self.assertTrue(keyFile.exists())
 
     def test_noRegeneration(self):
@@ -1687,15 +1687,15 @@ def test_noRegeneration(self):
         tempDir = FilePath(self.mktemp())
         keyFile = tempDir.child("mykey.pem")
 
-        key = keys._getPersistentRSAKey(keyFile, keySize=512)
-        self.assertEqual(key.size(), 512)
+        key = keys._getPersistentRSAKey(keyFile, keySize=1024)
+        self.assertEqual(key.size(), 1024)
         self.assertTrue(keyFile.exists())
         keyContent = keyFile.getContent()
 
-        # Set the key size to 1024 bits. Since it exists already, it will find
-        # the 512 bit key, and not generate a 1024 bit key.
-        key = keys._getPersistentRSAKey(keyFile, keySize=1024)
-        self.assertEqual(key.size(), 512)
+        # Set the key size to 2048 bits. Since it exists already, it will find
+        # the 1024 bit key, and not generate a 2048 bit key.
+        key = keys._getPersistentRSAKey(keyFile, keySize=2048)
+        self.assertEqual(key.size(), 1024)
         self.assertEqual(keyFile.getContent(), keyContent)
 
     def test_keySizeZero(self):
@@ -1706,6 +1706,6 @@ def test_keySizeZero(self):
         tempDir = FilePath(self.mktemp())
         keyFile = tempDir.child("mykey.pem")
 
-        key = keys._getPersistentRSAKey(keyFile, keySize=512)
+        key = keys._getPersistentRSAKey(keyFile, keySize=1024)
         key._keyObject = None
         self.assertEqual(key.size(), 0)

src/twisted/conch/test/test_manhole_tap.py

@@ -80,7 +80,7 @@ def test_sshPort(self) -> None:
                 "--sshKeyDir",
                 self.mktemp(),
                 "--sshKeySize",
-                "512",
+                "1024",
                 "--sshPort",
                 "tcp:223",
             ]

src/twisted/conch/unix.py

@@ -43,7 +43,7 @@
 from twisted.python.compat import nativeString
 
 try:
-    import utmp  # type: ignore[import]
+    import utmp
 except ImportError:
     utmp = None
 

src/twisted/internet/_dumbwin32proc.py

@@ -12,16 +12,16 @@
 
 from zope.interface import implementer
 
-import pywintypes  # type: ignore[import]
+import pywintypes
 
 # Win32 imports
-import win32api  # type: ignore[import]
-import win32con  # type: ignore[import]
-import win32event  # type: ignore[import]
-import win32file  # type: ignore[import]
-import win32pipe  # type: ignore[import]
-import win32process  # type: ignore[import]
-import win32security  # type: ignore[import]
+import win32api
+import win32con
+import win32event
+import win32file
+import win32pipe
+import win32process
+import win32security
 
 from twisted.internet import _pollingfile, error
 from twisted.internet._baseprocess import BaseProcess

src/twisted/internet/_glibbase.py

@@ -22,7 +22,7 @@
 from twisted.internet.interfaces import IReactorFDSet, IReadDescriptor, IWriteDescriptor
 from twisted.python import log
 from twisted.python.monkey import MonkeyPatcher
-from ._signals import _UnixWaker
+from ._signals import _IWaker, _UnixWaker
 
 
 def ensureNotImported(moduleNames, errorMessage, preventImports=[]):
@@ -77,7 +77,7 @@ def _signalGlue():
     reactor main loop which makes our signal handling work with glib's signal
     handling.
     """
-    from gi import _ossighelper as signalGlue  # type: ignore[import]
+    from gi import _ossighelper as signalGlue
 
     patcher = MonkeyPatcher()
     patcher.addPatch(signalGlue, "_wakeup_fd_is_active", True)
@@ -129,7 +129,7 @@ class GlibReactorBase(posixbase.PosixReactorBase, posixbase._PollLikeMixin):
 
     # Install a waker that knows it needs to call C{_simulate} in order to run
     # callbacks queued from a thread:
-    def _wakerFactory(self) -> GlibWaker:
+    def _wakerFactory(self) -> _IWaker:
         return GlibWaker(self)
 
     def __init__(self, glib_module: Any, gtk_module: Any, useGtk: bool = False) -> None:

src/twisted/internet/_pollingfile.py

@@ -95,10 +95,10 @@ def _pollEvent(self):
 # If we ever (let's hope not) need the above functionality on UNIX, this could
 # be factored into a different module.
 
-import pywintypes  # type: ignore[import]
-import win32api  # type: ignore[import]
-import win32file  # type: ignore[import]
-import win32pipe  # type: ignore[import]
+import pywintypes
+import win32api
+import win32file
+import win32pipe
 
 
 @implementer(IPushProducer)

src/twisted/internet/_posixserialport.py

@@ -9,8 +9,7 @@
 
 # dependent on pyserial ( http://pyserial.sf.net/ )
 # only tested w/ 1.18 (5 Dec 2002)
-from serial import PARITY_NONE  # type: ignore[import]
-from serial import EIGHTBITS, STOPBITS_ONE
+from serial import EIGHTBITS, PARITY_NONE, STOPBITS_ONE
 
 from twisted.internet import abstract, fdesc
 from twisted.internet.serialport import BaseSerialPort

src/twisted/internet/_signals.py

@@ -271,12 +271,12 @@ class _IWaker(Interface):
 
     disconnected = Attribute("")
 
-    def wakeUp():
+    def wakeUp() -> None:
         """
         Called when the event should be wake up.
         """
 
-    def doRead():
+    def doRead() -> None:
         """
         Read some data from my connection and discard it.
         """

src/twisted/internet/_sslverify.py

@@ -16,7 +16,7 @@
 from OpenSSL._util import lib as pyOpenSSLlib
 
 import attr
-from constantly import FlagConstant, Flags, NamedConstant, Names  # type: ignore[import]
+from constantly import FlagConstant, Flags, NamedConstant, Names
 from incremental import Version
 
 from twisted.internet.abstract import isIPAddress, isIPv6Address

src/twisted/internet/_win32serialport.py

@@ -10,13 +10,12 @@
 """
 
 
-import win32event  # type: ignore[import]
-import win32file  # type: ignore[import]
+import win32event
+import win32file
 
 # system imports
-from serial import PARITY_NONE  # type: ignore[import]
-from serial import EIGHTBITS, STOPBITS_ONE
-from serial.serialutil import to_bytes  # type: ignore[import]
+from serial import EIGHTBITS, PARITY_NONE, STOPBITS_ONE
+from serial.serialutil import to_bytes
 
 # twisted imports
 from twisted.internet import abstract

src/twisted/internet/_win32stdio.py

@@ -10,7 +10,7 @@
 
 from zope.interface import implementer
 
-import win32api  # type: ignore[import]
+import win32api
 
 from twisted.internet import _pollingfile, main
 from twisted.internet.interfaces import (

src/twisted/internet/cfreactor.py

@@ -17,7 +17,7 @@
 
 from zope.interface import implementer
 
-from CFNetwork import (  # type: ignore[import]
+from CFNetwork import (
     CFSocketCreateRunLoopSource,
     CFSocketCreateWithNative,
     CFSocketDisableCallBacks,
@@ -30,7 +30,7 @@
     kCFSocketReadCallBack,
     kCFSocketWriteCallBack,
 )
-from CoreFoundation import (  # type: ignore[import]
+from CoreFoundation import (
     CFAbsoluteTimeGetCurrent,
     CFRunLoopAddSource,
     CFRunLoopAddTimer,