Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 26 insertions, 22 deletions

diff --git a/python3-twisted/.footprint b/python3-twisted/.footprint
index 9e99ecbed..7d49f5e22 100644
--- a/python3-twisted/.footprint
+++ b/python3-twisted/.footprint
@@ -12,14 +12,14 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/not-zip-safe
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.4.0-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/not-zip-safe
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Twisted-22.8.0-py3.10.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/__init__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/__main__.py
@@ -1446,8 +1446,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_appdirs.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_inotify.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_inotify.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_pydoctor.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_pydoctor.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_release.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_release.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/_shellcomp.cpython-310.opt-1.pyc
@@ -1534,11 +1532,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/__pycache__/zipstream.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_appdirs.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_inotify.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_pydoctor.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/python/_pydoctortemplates/
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_pydoctortemplates/common.html
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_pydoctortemplates/footer.html
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_pydoctortemplates/header.html
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_pydoctortemplates/subheader.html
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_release.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_shellcomp.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/_textattributes.py
@@ -1595,8 +1590,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pyca
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_htmlizer.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_inotify.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_inotify.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_pydoctor.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_pydoctor.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_release.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_release.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pycache__/test_runtime.cpython-310.opt-1.pyc
@@ -1637,7 +1630,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/python/test/__pyca
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/test_fakepwd.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/test_htmlizer.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/test_inotify.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/test_pydoctor.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/test_release.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/test_runtime.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/python/test/test_sendmsg.py
@@ -2130,6 +2122,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pyca
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/distreporter.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/disttrial.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/disttrial.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/functional.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/functional.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/managercommands.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/managercommands.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/options.cpython-310.opt-1.pyc
@@ -2144,6 +2138,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pyca
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/__pycache__/workertrial.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/distreporter.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/disttrial.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/functional.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/managercommands.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/options.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/
@@ -2151,6 +2146,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/matchers.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/matchers.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/test_distreporter.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/test_distreporter.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/test_disttrial.cpython-310.opt-1.pyc
@@ -2163,6 +2160,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/_
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/test_workerreporter.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/test_workertrial.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/__pycache__/test_workertrial.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/matchers.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/test_distreporter.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/test_disttrial.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/_dist/test/test_options.py
@@ -2186,6 +2184,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/detests.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/erroneous.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/erroneous.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/matchers.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/matchers.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/mockcustomsuite.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/mockcustomsuite.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/mockcustomsuite2.cpython-310.opt-1.pyc
@@ -2204,6 +2204,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/ordertests.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/packages.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/packages.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/pyunitcases.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/pyunitcases.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/sample.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/sample.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/scripttest.cpython-310.opt-1.pyc
@@ -2254,6 +2256,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycache__/weird.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/detests.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/erroneous.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/matchers.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/mockcustomsuite.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/mockcustomsuite2.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/mockcustomsuite3.py
@@ -2263,6 +2266,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/__pycac
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/novars.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/ordertests.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/packages.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/pyunitcases.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/sample.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/scripttest.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/twisted/trial/test/skipping.py
diff --git a/python3-twisted/.signature b/python3-twisted/.signature
index f4215af74..bd2870e56 100644
--- a/python3-twisted/.signature
+++ b/python3-twisted/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3ypyi9XnJXuf9M6L5agQWbG7wtoSPzuW8k7TQW4tvYBH2Ghh9pa3TtGvddFOYS0trEtvu0nNNObonX1UrzvVTws=
-SHA256 (Pkgfile) = 8ce1ddbd323c8ca6ff57b0303ce7b8d42cc7d41bf1e6246d825527fd76523f4b
-SHA256 (.footprint) = 45895242e513674dd793e58110137f13742fa8cd34ac61691a3c1acfed1ae9f6
-SHA256 (twisted-22.4.0.tar.gz) = 0a21cc06f181459bc9da59fe85b9a8192a31cd416c172ec2aa2f85cc305458b7
+RWSagIOpLGJF3wfxj0dOxJXVsAksAQTjOpQzhPiRJ2VZfrHUte7SmXXSlD3kMVXIYJlJuecdm8sJ6bHu2Y75Q3gzmJUvOaWluww=
+SHA256 (Pkgfile) = 2fab0f9e719655d596f8a5edb721bc322e7bd7b6f8b22d6c26ac8a3d3ed284d2
+SHA256 (.footprint) = f77c22c4909ec8ad83e68606fdd0b0055e025307d4dfd1063c2b3c407e930c27
+SHA256 (twisted-22.8.0.tar.gz) = 3d17049da4b7c66b11359ff29eeea103ef8356f2aec2e4fc3d78c1920fc622a1
diff --git a/python3-twisted/Pkgfile b/python3-twisted/Pkgfile
index eb06d42ae..aaf2187f4 100644
--- a/python3-twisted/Pkgfile
+++ b/python3-twisted/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: python3-automat python3-constantly python3-hyperlink python3-incremental python3-zope-interface
 
 name=python3-twisted
-version=22.4.0
+version=22.8.0
 release=1
 source=(https://github.com/twisted/twisted/archive/twisted-$version.tar.gz)