Merge branch 'trunk' into 10303-deprecate-py36

DefaultUser · Feb 8, 2022 · bce8e81 · bce8e81
2 parents 20d90d6 + 9045ef7
commit bce8e81
Show file tree

Hide file tree

Showing 45 changed files with 145 additions and 34 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2021
+Copyright (c) 2001-2022
 Allen Short
 Amber Hawkie Brown
 Andrew Bennetts

diff --git a/NEWS.rst b/NEWS.rst
@@ -3,6 +3,109 @@ http://twistedmatrix.com/trac/ticket/<number>
 
 .. towncrier release notes start
 
+Twisted 22.1.0 (2022-02-03)
+===========================
+
+Features
+--------
+
+- Python 3.10 is now a supported platform (#10224)
+- Type annotations have been added to the twisted.python.fakepwd module. (#10287)
+
+
+Bugfixes
+--------
+
+- twisted.internet.defer.inlineCallbacks has an improved type annotation, to avoid typing errors when it is used on a function which returns a non-None result. (#10231)
+- ``twisted.internet.base.DelayedCall.__repr__`` and ``twisted.internet.task.LoopingCall.__repr__`` had the changes from #10155 reverted to accept non-function callables.  (#10235)
+- Revert the removal of .whl building that was done as part of #10177. (#10236)
+- The type annotation of the host parameter to twisted.internet.interfaces.IReactorTCP.connectTCP has been corrected from bytes to str. (#10251)
+- Deprecated ``twisted.python.threading.ThreadPool.currentThread()`` in favor of ``threading.current_thread()``.
+  Switched ``twisted.python.threading.ThreadPool.currentThread()`` and ``twisted.python.threadable.getThreadID()`` to use `threading.current_thread()`` to avoid the deprecation warnings introduced for ``threading.currentThread()`` in Python 3.10. (#10273)
+
+
+Improved Documentation
+----------------------
+
+- twisted.internet.utils.runWithWarningsSupressed behavior of waiting on deferreds has been documented. (#10238)
+- Sync API docs templates with pydoctor 21.9.0 release, using new theming capabilities. (#10267)
+
+
+Misc
+----
+
+- #1681, #9944, #10198, #10218, #10219, #10228, #10229, #10234, #10239, #10240, #10245, #10246, #10248, #10250, #10255, #10277, #10288, #10292
+
+
+Conch
+-----
+
+Bugfixes
+--------
+
+- SSHTransportBase.ssh_KEXINIT now uses the remote peer preferred MAC list for negotiation. In previous versions  it was only using the local preferred MAC list. (#10241)
+
+
+Features
+~~~~~~~~
+
+- twisted.conch.ssh now supports SSH extension negotiation (RFC 8308). (#10266)
+
+
+Bugfixes
+~~~~~~~~
+
+- twisted.conch now uses constant-time comparisons for MACs. (#8199)
+- twisted.conch.ssh.filetransfer.FileTransferServer will now return an ENOENT error status if an SFTP client tries to close an unrecognized file handle. (#10293)
+
+
+Web
+---
+
+Bugfixes
+~~~~~~~~
+
+- twisted.web.client.RedirectAgent and twisted.web.client.BrowserLikeRedirectAgent now properly remove sensitive headers when redirecting to a different origin. (#10294)
+
+
+Improved Documentation
+----------------------
+
+- Add type annotations for twisted.web.client.readBody. (#10269)
+
+
+Deprecations and Removals
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- twisted.web.client.getPage, twisted.web.client.downladPage, and the associated implementation classes (HTTPPageGetter, HTTPPageDownloader, HTTPClientFactory, HTTPDownloader) have been removed because they do not segregate cookies by domain. They were deprecated in Twisted 16.7.0 in favor of twisted.web.client.Agent. GHSA-92x2-jw7w-xvvx. (#10295)
+
+
+Mail
+----
+
+No significant changes.
+
+
+Words
+-----
+
+No significant changes.
+
+
+Names
+-----
+
+No significant changes.
+
+
+Trial
+-----
+
+Bugfixes
+~~~~~~~~
+
+- trial.runner.filenameToModule now sets the correct module.__name__ and sys.modules key (#10230)
+
 
 Twisted 21.7.0 (2021-07-26)
 ===========================

diff --git a/README.rst b/README.rst
@@ -87,7 +87,7 @@ Or, for speed, use pre-commit directly::
 Copyright
 ---------
 
-All of the code in this distribution is Copyright (c) 2001-2021 Twisted Matrix Laboratories.
+All of the code in this distribution is Copyright (c) 2001-2022 Twisted Matrix Laboratories.
 
 Twisted is made available under the MIT license.
 The included `LICENSE <LICENSE>`_ file describes this in detail.

diff --git a/src/twisted/_version.py b/src/twisted/_version.py
@@ -7,5 +7,5 @@
 
 from incremental import Version
 
-__version__ = Version("Twisted", 21, 7, 0, post=0)
+__version__ = Version("Twisted", 22, 1, 0, post=0)
 __all__ = ["__version__"]
diff --git a/src/twisted/conch/newsfragments/10266.feature b/src/twisted/conch/newsfragments/10266.feature
diff --git a/src/twisted/conch/newsfragments/10293.bugfix b/src/twisted/conch/newsfragments/10293.bugfix
diff --git a/src/twisted/conch/newsfragments/8199.bugfix b/src/twisted/conch/newsfragments/8199.bugfix
diff --git a/src/twisted/copyright.py b/src/twisted/copyright.py
@@ -13,7 +13,7 @@
 longversion = str(_longversion)
 
 copyright = """\
-Copyright (c) 2001-2021 Twisted Matrix Laboratories.
+Copyright (c) 2001-2022 Twisted Matrix Laboratories.
 See LICENSE for details."""
 
 disclaimer = """

diff --git a/src/twisted/internet/_glibbase.py b/src/twisted/internet/_glibbase.py
@@ -354,8 +354,8 @@ def simulate(self):
         if self._simtag is not None:
             self._source_remove(self._simtag)
         self.iterate()
-        timeout = min(self.timeout(), 0.01)
-        if timeout is None:
+        timeout = self.timeout()
+        if timeout is None or timeout > 0.01:
             timeout = 0.01
         self._simtag = self._timeout_add(
             int(timeout * 1000),

diff --git a/src/twisted/internet/test/test_glibbase.py b/src/twisted/internet/test/test_glibbase.py
@@ -65,3 +65,36 @@ def test_ensureFailsWhenImported(self):
         )
         self.assertEqual(modules, {"m2": module})
         self.assertEqual(e.args, ("A message.",))
+
+
+try:
+    from twisted.internet import gireactor as _gireactor
+except ImportError:
+    gireactor = None
+else:
+    gireactor = _gireactor
+
+missingGlibReactor = None
+if gireactor is None:
+    missingGlibReactor = "gi reactor not available"
+
+
+class GlibReactorBaseTests(TestCase):
+    """
+    Tests for the private C{twisted.internet._glibbase.GlibReactorBase}
+    done via the public C{twisted.internet.gireactor.PortableGIReactor}
+    """
+
+    skip = missingGlibReactor
+
+    def test_simulate(self):
+        """
+        C{simulate} can be called without raising any errors when there are
+        no delayed calls for the reactor and hence there is no defined sleep
+        period.
+        """
+        sut = gireactor.PortableGIReactor(usegtk=False)
+        # Double check that reactor has no sleep period.
+        self.assertIs(None, sut.timeout())
+
+        sut.simulate()
diff --git a/src/twisted/internet/test/test_threads.py b/src/twisted/internet/test/test_threads.py
@@ -224,7 +224,7 @@ def check():
     def test_threadPoolCurrentThreadDeprecated(self):
         self.callDeprecated(
             version=(
-                Version("Twisted", "NEXT", 0, 0),
+                Version("Twisted", 22, 1, 0),
                 "threading.current_thread",
             ),
             f=ThreadPool.currentThread,

diff --git a/src/twisted/newsfragments/10198.misc b/src/twisted/newsfragments/10198.misc
diff --git a/src/twisted/newsfragments/10218.misc b/src/twisted/newsfragments/10218.misc
diff --git a/src/twisted/newsfragments/10219.misc b/src/twisted/newsfragments/10219.misc
diff --git a/src/twisted/newsfragments/10224.feature b/src/twisted/newsfragments/10224.feature
diff --git a/src/twisted/newsfragments/10228.misc b/src/twisted/newsfragments/10228.misc
diff --git a/src/twisted/newsfragments/10229.misc b/src/twisted/newsfragments/10229.misc
diff --git a/src/twisted/newsfragments/10231.bugfix b/src/twisted/newsfragments/10231.bugfix
diff --git a/src/twisted/newsfragments/10234.misc b/src/twisted/newsfragments/10234.misc
diff --git a/src/twisted/newsfragments/10235.bugfix b/src/twisted/newsfragments/10235.bugfix
diff --git a/src/twisted/newsfragments/10236.bugfix b/src/twisted/newsfragments/10236.bugfix
diff --git a/src/twisted/newsfragments/10238.doc b/src/twisted/newsfragments/10238.doc
diff --git a/src/twisted/newsfragments/10239.misc b/src/twisted/newsfragments/10239.misc
diff --git a/src/twisted/newsfragments/10240.misc b/src/twisted/newsfragments/10240.misc
diff --git a/src/twisted/newsfragments/10241.bugfix b/src/twisted/newsfragments/10241.bugfix
diff --git a/src/twisted/newsfragments/10245.misc b/src/twisted/newsfragments/10245.misc
diff --git a/src/twisted/newsfragments/10246.misc b/src/twisted/newsfragments/10246.misc
diff --git a/src/twisted/newsfragments/10248.misc b/src/twisted/newsfragments/10248.misc
diff --git a/src/twisted/newsfragments/10250.misc b/src/twisted/newsfragments/10250.misc
diff --git a/src/twisted/newsfragments/10251.bugfix b/src/twisted/newsfragments/10251.bugfix
diff --git a/src/twisted/newsfragments/10255.misc b/src/twisted/newsfragments/10255.misc
diff --git a/src/twisted/newsfragments/10267.doc b/src/twisted/newsfragments/10267.doc
diff --git a/src/twisted/newsfragments/10269.doc b/src/twisted/newsfragments/10269.doc
diff --git a/src/twisted/newsfragments/10273.bugfix b/src/twisted/newsfragments/10273.bugfix
diff --git a/src/twisted/newsfragments/10277.misc b/src/twisted/newsfragments/10277.misc
diff --git a/src/twisted/newsfragments/10287.feature b/src/twisted/newsfragments/10287.feature
diff --git a/src/twisted/newsfragments/10288.misc b/src/twisted/newsfragments/10288.misc
diff --git a/src/twisted/newsfragments/10292.misc b/src/twisted/newsfragments/10292.misc
diff --git a/src/twisted/newsfragments/10294.bugfix b/src/twisted/newsfragments/10294.bugfix
diff --git a/src/twisted/newsfragments/1681.misc b/src/twisted/newsfragments/1681.misc
diff --git a/src/twisted/newsfragments/9660.bugfix b/src/twisted/newsfragments/9660.bugfix
@@ -0,0 +1 @@
+twisted.internet.gireactor.PortableGIReactor.simulate and twisted.internet.gtk2reactor.PortableGtkReactor.simulate no longer raises TypeError when there are no delayed called. This was a regression introduced with the migration to Python3 in which the builtin `min` function no longer accepts `None` as an argument.
diff --git a/src/twisted/newsfragments/9944.misc b/src/twisted/newsfragments/9944.misc
diff --git a/src/twisted/python/threadpool.py b/src/twisted/python/threadpool.py
@@ -47,7 +47,7 @@ class ThreadPool:
     threadFactory = Thread
     currentThread = staticmethod(
         deprecated(
-            version=Version("Twisted", "NEXT", 0, 0),
+            version=Version("Twisted", 22, 1, 0),
             replacement="threading.current_thread",
         )(current_thread)
     )

diff --git a/src/twisted/trial/newsfragments/10230.bugfix b/src/twisted/trial/newsfragments/10230.bugfix
diff --git a/src/twisted/web/newsfragments/10295.removal b/src/twisted/web/newsfragments/10295.removal
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		twisted.internet.gireactor.PortableGIReactor.simulate and twisted.internet.gtk2reactor.PortableGtkReactor.simulate no longer raises TypeError when there are no delayed called. This was a regression introduced with the migration to Python3 in which the builtin `min` function no longer accepts `None` as an argument.