Bug 1940455 [wpt PR 49970] - Add support for Python 3.13, a=testonly

Automatic update from web-platform-tests
Import fork of Python cgi library into wptserve

This code has been dropped from Python 3.13, but we depend on
FieldStorage as part of the request API. The easiest option here is to
directly import the code that we are already using (the last version
on the 3.12 branch, but with the deprecation warning removed), along
with a copy of the PSF License which covers the cgi module code.

--
Use vendored cgi lib in wptserve

--
Update third party deps for Python 3.13 support

--
Fix lock in QueueHandler class to be a dummy implementation of the Lock API

This is required since the logging module started using the lock as a context manager,
and calling the acquire and release methods.

--
Update getting context manager when running serve directly

Remove code only needed for Python < 3.4 and ensure that we always use the spawn
form of multiprocessing to avoid problems with fork and locks.

--
Update tox configurations to include Python 3.13

--
Update Azure configuration for Python 3.13

--
Update taskcluster configuration for Python 3.13

--
Exclude cgi code from flake8

--
Ignore errors in imported cgi module

Just adding this to the excludes doesn't work, because we still check the imported
code.

--
Add cgi tests

Lightly modified from the version in Python 3.12 as follows:
* Inlined check__all__ function
* Converted the use of ignore_warnings helper to use warning module directly

--
Update Pillow for Python>=3.9

--
Remove dep on typed-ast

This is no longer support in Python 3.13, and no longer required for Python>=3.8

--
Fix cgi tests to be compatible with behaviour of older Python versions

--
Add types to NullLock and rename to NullRLock

--
Update assert_png to check for magic bytes directly

This avoids the use of imghdr which was removed in Ptyhon 3.13

--

wpt-commits: c80b8b9f035ac4c9d8c238e8389caee6f76a97fc, c1fd85e0337d69ba3fdacd27b69ce25cf486d2ef, 36548a344ca86a9a8d3fe5968469dc49d2ce9931, d22ded6ced64889f09de80b309601521ce1a43d5, 5ddbf24f7390d28c992797353236660143d92599, 2ae5ea7bd1d3498e623ce4436cb26be3ab1a6d15, ac6d6f7bfbe74f647ebce82dc6b5c9c2cfdd7bc5, d1f396d8983543511f0208509a076a2072163815, 408f275bd0c40fe7d4895ce4eec75bf6c7f40ee7, 3f5d5c6a6c1b5e720804b7dd8db94d14dfbaf74d, 43595084855f54ce85d89aaebb4a5302bcb7270c, a0e0465d0d0238b56328d7237e63f71806b1ea59, 43dc34dd9389475155a50209035520b67d3a5a38, 16730d4b2572f230665aa653d6d98e7ec6e78d2c, 06f93bb52645f20f8c28547741e2161f97109393, 9f1d2f767cf880a5b1d6092b0cef4e356c0e7619
wpt-pr: 49970

Author: jgraham

testing/web-platform/tests/.azure-pipelines.yml

@@ -54,7 +54,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/affected_tests.yml
     parameters:
       checkoutCommit: 'HEAD^1'
@@ -75,7 +75,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/checkout.yml
   - script: |
       set -eux -o pipefail
@@ -96,7 +96,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/install_fonts.yml
   - template: tools/ci/azure/install_certs.yml
@@ -134,21 +134,21 @@ jobs:
       directory: tools/
       toxenv: py38
 
-- job: tools_unittest_mac_py311
-  displayName: 'tools/ unittests: macOS + Python 3.12'
+- job: tools_unittest_mac_py313
+  displayName: 'tools/ unittests: macOS + Python 3.13'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.tools_unittest']
   pool:
     vmImage: 'macOS-14'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/
-      toxenv: py311
+      toxenv: py313
 
 - job: wptrunner_unittest_mac_py38
   displayName: 'tools/wptrunner/ unittests: macOS + Python 3.8'
@@ -166,21 +166,21 @@ jobs:
       directory: tools/wptrunner/
       toxenv: py38
 
-- job: wptrunner_unittest_mac_py311
-  displayName: 'tools/wptrunner/ unittests: macOS + Python 3.12'
+- job: wptrunner_unittest_mac_py313
+  displayName: 'tools/wptrunner/ unittests: macOS + Python 3.13'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
   pool:
     vmImage: 'macOS-14'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wptrunner/
-      toxenv: py311
+      toxenv: py313
 
 - job: wpt_integration_mac_py38
   displayName: 'tools/wpt/ tests: macOS + Python 3.8'
@@ -202,8 +202,8 @@ jobs:
       directory: tools/wpt/
       toxenv: py38
 
-- job: wpt_integration_mac_py311
-  displayName: 'tools/wpt/ tests: macOS + Python 3.12'
+- job: wpt_integration_mac_py313
+  displayName: 'tools/wpt/ tests: macOS + Python 3.13'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
@@ -212,15 +212,15 @@ jobs:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/install_chrome.yml
   - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wpt/
-      toxenv: py311
+      toxenv: py313
 
 - job: tools_unittest_win_py38
   displayName: 'tools/ unittests: Windows + Python 3.8'
@@ -241,22 +241,22 @@ jobs:
       directory: tools/
       toxenv: py38
 
-- job: tools_unittest_win_py311
-  displayName: 'tools/ unittests: Windows + Python 3.12'
+- job: tools_unittest_win_py313
+  displayName: 'tools/ unittests: Windows + Python 3.13'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.tools_unittest']
   pool:
     vmImage: 'windows-2019'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
       addToPath: false
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/
-      toxenv: py311
+      toxenv: py313
 
 - job: wptrunner_unittest_win_py38
   displayName: 'tools/wptrunner/ unittests: Windows + Python 3.8'
@@ -275,22 +275,22 @@ jobs:
       directory: tools/wptrunner/
       toxenv: py38
 
-- job: wptrunner_unittest_win_py311
-  displayName: 'tools/wptrunner/ unittests: Windows + Python 3.12'
+- job: wptrunner_unittest_win_py313
+  displayName: 'tools/wptrunner/ unittests: Windows + Python 3.13'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
   pool:
     vmImage: 'windows-2019'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
       addToPath: false
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wptrunner/
-      toxenv: py311
+      toxenv: py313
 
 - job: wpt_integration_win_py38
   displayName: 'tools/wpt/ tests: Windows + Python 3.8'
@@ -314,8 +314,8 @@ jobs:
       directory: tools/wpt/
       toxenv: py38
 
-- job: wpt_integration_win_py311
-  displayName: 'tools/wpt/ tests: Windows + Python 3.12'
+- job: wpt_integration_win_py313
+  displayName: 'tools/wpt/ tests: Windows + Python 3.13'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
@@ -324,7 +324,7 @@ jobs:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   # currently just using the outdated Chrome/Firefox on the VM rather than
   # figuring out how to install Chrome Dev channel on Windows
   # - template: tools/ci/azure/install_chrome.yml
@@ -334,7 +334,7 @@ jobs:
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wpt/
-      toxenv: py311
+      toxenv: py313
 
 - job: results_edge_stable
   displayName: 'all tests: Edge Stable'
@@ -350,7 +350,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/install_certs.yml
@@ -386,7 +386,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/install_certs.yml
@@ -422,7 +422,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/install_edge.yml
@@ -456,7 +456,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12'
+      versionSpec: '3.13'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml

testing/web-platform/tests/tools/ci/tc/tasks/test.yml

@@ -127,14 +127,14 @@ components:
       - python3.8-dev
       - python3.8-venv
 
-  tox-python3_12:
+  tox-python3_13:
     env:
-      TOXENV: py312
+      TOXENV: py313
       PY_COLORS: "0"
     install:
-      - python3.12
-      - python3.12-dev
-      - python3.12-venv
+      - python3.13
+      - python3.13-dev
+      - python3.13-venv
   tests-affected:
     options:
       browser:
@@ -471,13 +471,13 @@ tasks:
         run-job:
           - tools_unittest
 
-  - tools/ unittests (Python 3.12):
+  - tools/ unittests (Python 3.13):
       description: >-
-        Unit tests for tools running under Python 3.12, excluding wptrunner
+        Unit tests for tools running under Python 3.13, excluding wptrunner
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_12
+        - tox-python3_13
       command: ./tools/ci/ci_tools_unittest.sh
       env:
         HYPOTHESIS_PROFILE: ci
@@ -507,13 +507,13 @@ tasks:
         run-job:
           - wpt_integration
 
-  - tools/ integration tests (Python 3.12):
+  - tools/ integration tests (Python 3.13):
       description: >-
-        Integration tests for tools running under Python 3.12
+        Integration tests for tools running under Python 3.13
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_12
+        - tox-python3_13
       command: ./tools/ci/ci_tools_integration_test.sh
       install:
         - libnss3-tools
@@ -548,13 +548,13 @@ tasks:
         run-job:
           - resources_unittest
 
-  - resources/ tests (Python 3.12):
+  - resources/ tests (Python 3.13):
       description: >-
-        Tests for testharness.js and other files in resources/ under Python 3.12
+        Tests for testharness.js and other files in resources/ under Python 3.13
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_12
+        - tox-python3_13
       command: ./tools/ci/ci_resources_unittest.sh
       install:
         - libnss3-tools

testing/web-platform/tests/tools/ci/tc/tests/test_valid.py

@@ -177,11 +177,11 @@ def test_verify_payload():
     ("pr_event.json", True, {".taskcluster.yml", ".travis.yml", "tools/ci/start.sh"},
      ['lint',
       'tools/ unittests (Python 3.8)',
-      'tools/ unittests (Python 3.12)',
+      'tools/ unittests (Python 3.13)',
       'tools/ integration tests (Python 3.8)',
-      'tools/ integration tests (Python 3.12)',
+      'tools/ integration tests (Python 3.13)',
       'resources/ tests (Python 3.8)',
-      'resources/ tests (Python 3.12)',
+      'resources/ tests (Python 3.13)',
       'download-firefox-nightly',
       'infrastructure/ tests',
       'sink-task']),
@@ -199,7 +199,7 @@ def test_verify_payload():
     ("pr_event_tests_affected.json", True, {"resources/testharness.js"},
      ['lint',
       'resources/ tests (Python 3.8)',
-      'resources/ tests (Python 3.12)',
+      'resources/ tests (Python 3.13)',
       'download-firefox-nightly',
       'infrastructure/ tests',
       'sink-task']),

testing/web-platform/tests/tools/flake8.ini

@@ -23,4 +23,5 @@ exclude =
     third_party,
     wptserve/docs/conf.py,
     wptserve/tests/functional/docroot/invalid.py
+    wptserve/wptserve/cgi/
 max-line-length = 141

testing/web-platform/tests/tools/manifest/requirements.txt

@@ -1 +1 @@
-zstandard==0.22.0
+zstandard==0.23.0

testing/web-platform/tests/tools/mypy.ini

@@ -6,7 +6,7 @@
 # - All setup.py files (avoiding duplicate module named "setup")
 # - tools/wptserve/docs/conf.py (generated code)
 # - tools/wptserve/tests/ (deliberately invalid syntax)
-exclude = (^tools/third_party/|/setup\.py$|^tools/wptserve/docs/conf.py|^tools/wptserve/tests/|^tools/third_party_modified/mozlog/)
+exclude = (^tools/third_party/|/setup\.py$|^tools/wptserve/docs/conf.py|^tools/wptserve/tests/|^tools/third_party_modified/mozlog/|^tools/wptserve/wptserve/cgi/test_cgi\.py$)
 mypy_path = tools/wptrunner:tools/wptserve:tools/webdriver:tools/webtransport
 #check_untyped_defs = True
 disallow_any_generics = True
@@ -36,6 +36,9 @@ ignore_missing_imports = True
 [mypy-Quartz.*]
 ignore_missing_imports = True
 
+[mypy-cgi.*]
+ignore_missing_imports = True
+
 [mypy-github.*]
 ignore_missing_imports = True
 

testing/web-platform/tests/tools/requirements_mypy.txt

@@ -2,7 +2,6 @@ mypy==1.14.0
 mypy-extensions==1.0.0
 toml==0.10.2
 tomli==2.0.1
-typed-ast==1.5.5
 types-atomicwrites==1.4.5.1
 types-python-dateutil==2.9.0.20240906
 types-PyYAML==6.0.12.12

testing/web-platform/tests/tools/serve/serve.py

@@ -1418,10 +1418,7 @@ def run(config_cls=ConfigBuilder, route_builder=None, mp_context=None, log_handl
     logger = get_logger("INFO", log_handlers)
 
     if mp_context is None:
-        if hasattr(multiprocessing, "get_context"):
-            mp_context = multiprocessing.get_context()
-        else:
-            mp_context = MpContext()
+        mp_context = multiprocessing.get_context("spawn")
 
     with build_config(logger,
                       os.path.join(repo_root, "config.json"),

testing/web-platform/tests/tools/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,py39,py310,py311,py312,{py38,py39,py310,py311,py312}-{flake8,mypy}
+envlist = py38,py39,py310,py311,py312,py313,{py38,py39,py310,py311,py312,py313}-{flake8,mypy}
 skipsdist=True
 skip_missing_interpreters=False
 

testing/web-platform/tests/tools/wave/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,py39,py310,py311,py312
+envlist = py38,py39,py310,py311,py312,py312
 skipsdist=True
 skip_missing_interpreters = False
 

testing/web-platform/tests/tools/wpt/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,py39,py310,py311,py312
+envlist = py38,py39,py310,py311,py312,py312
 skipsdist=True
 skip_missing_interpreters = False