Merge branch 'main' of https://github.com/python/cpython into struct-78724

Author: kumaraditya303

.azure-pipelines/ci.yml

@@ -57,7 +57,7 @@ jobs:
   variables:
     testRunTitle: '$(build.sourceBranchName)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1n
+    openssl_version: 1.1.1q
 
   steps:
   - template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1n
+    openssl_version: 1.1.1q
 
   steps:
   - template: ./posix-steps.yml

.azure-pipelines/find-tools.yml

@@ -57,7 +57,7 @@ jobs:
   variables:
     testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
     testRunPlatform: linux
-    openssl_version: 1.1.1n
+    openssl_version: 1.1.1q
 
   steps:
   - template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
   variables:
     testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
     testRunPlatform: linux-coverage
-    openssl_version: 1.1.1n
+    openssl_version: 1.1.1q
 
   steps:
   - template: ./posix-steps.yml

.azure-pipelines/libffi-build.yml

@@ -28,8 +28,8 @@ Lib/test/cjkencodings/*                    noeol
 Lib/test/coding20731.py                    noeol
 Lib/test/decimaltestdata/*.decTest         noeol
 Lib/test/test_email/data/*.txt             noeol
-Lib/test/test_importlib/data01/*           noeol
-Lib/test/test_importlib/namespacedata01/*  noeol
+Lib/test/test_importlib/resources/data01/*           noeol
+Lib/test/test_importlib/resources/namespacedata01/*  noeol
 Lib/test/xmltestdata/*                     noeol
 
 # CRLF files
@@ -62,26 +62,27 @@ PCbuild/readme.txt  dos
 #
 [attr]generated linguist-generated=true diff=generated
 
-**/clinic/*.c.h                              generated
-*_db.h                                       generated
-Doc/data/stable_abi.dat                      generated
-Doc/library/token-list.inc                   generated
-Include/internal/pycore_ast.h                generated
-Include/internal/pycore_ast_state.h          generated
-Include/internal/pycore_opcode.h             generated
-Include/opcode.h                             generated
-Include/token.h                              generated
-Lib/keyword.py                               generated
-Lib/test/test_stable_abi_ctypes.py           generated
-Lib/token.py                                 generated
-Objects/typeslots.inc                        generated
-PC/python3dll.c                              generated
-Parser/parser.c                              generated
-Parser/token.c                               generated
-Programs/test_frozenmain.h                   generated
-Python/Python-ast.c                          generated
-Python/opcode_targets.h                      generated
-Python/stdlib_module_names.h                 generated
-Tools/peg_generator/pegen/grammar_parser.py  generated
-aclocal.m4                                   generated
-configure                                    generated
+**/clinic/*.c.h                                     generated
+*_db.h                                              generated
+Doc/data/stable_abi.dat                             generated
+Doc/library/token-list.inc                          generated
+Include/internal/pycore_ast.h                       generated
+Include/internal/pycore_ast_state.h                 generated
+Include/internal/pycore_opcode.h                    generated
+Include/internal/pycore_runtime_init_generated.h    generated
+Include/opcode.h                                    generated
+Include/token.h                                     generated
+Lib/keyword.py                                      generated
+Lib/test/test_stable_abi_ctypes.py                  generated
+Lib/token.py                                        generated
+Objects/typeslots.inc                               generated
+PC/python3dll.c                                     generated
+Parser/parser.c                                     generated
+Parser/token.c                                      generated
+Programs/test_frozenmain.h                          generated
+Python/Python-ast.c                                 generated
+Python/opcode_targets.h                             generated
+Python/stdlib_module_names.h                        generated
+Tools/peg_generator/pegen/grammar_parser.py         generated
+aclocal.m4                                          generated
+configure                                           generated