Merge branch 'main' into restore-set-event-loop-policy-to-asyncio-run

graingert · web-flow · commit 489d54442f33 · 2022-06-22T19:18:53.000+01:00
diff --git a/.github/workflows/verify-ensurepip-wheels.yml b/.github/workflows/verify-ensurepip-wheels.yml
@@ -0,0 +1,28 @@
+name: Verify bundled pip and setuptools
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'Lib/ensurepip/_bundled/**'
+      - '.github/workflows/verify-ensurepip-wheels.yml'
+      - 'Tools/scripts/verify_ensurepip_wheels.py'
+  pull_request:
+    paths:
+      - 'Lib/ensurepip/_bundled/**'
+      - '.github/workflows/verify-ensurepip-wheels.yml'
+      - 'Tools/scripts/verify_ensurepip_wheels.py'
+
+permissions:
+  contents: read
+
+jobs:
+  verify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3'
+      - name: Compare checksums of bundled pip and setuptools to ones published on PyPI
+        run: ./Tools/scripts/verify_ensurepip_wheels.py
diff --git a/Doc/includes/email-headers.py b/Doc/includes/email-headers.py
@@ -1,5 +1,6 @@
 # Import the email modules we'll need
-from email.parser import BytesParser, Parser
+#from email.parser import BytesParser
+from email.parser import Parser
 from email.policy import default
 
 # If the e-mail headers are in a file, uncomment these two lines:
diff --git a/Doc/tools/extensions/asdl_highlight.py b/Doc/tools/extensions/asdl_highlight.py
@@ -1,12 +1,11 @@
-import os
 import sys
 from pathlib import Path
 
 CPYTHON_ROOT = Path(__file__).resolve().parent.parent.parent.parent
 sys.path.append(str(CPYTHON_ROOT / "Parser"))
 
 from pygments.lexer import RegexLexer, bygroups, include, words
-from pygments.token import (Comment, Generic, Keyword, Name, Operator,
+from pygments.token import (Comment, Keyword, Name, Operator,
                             Punctuation, Text)
 
 from asdl import builtin_types
diff --git a/Doc/tools/extensions/peg_highlight.py b/Doc/tools/extensions/peg_highlight.py
@@ -1,5 +1,5 @@
 from pygments.lexer import RegexLexer, bygroups, include
-from pygments.token import Comment, Generic, Keyword, Name, Operator, Punctuation, Text
+from pygments.token import Comment, Keyword, Name, Operator, Punctuation, Text
 
 from sphinx.highlighting import lexers
 
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
@@ -30,7 +30,6 @@
 from sphinx.util import status_iterator, logging
 from sphinx.util.nodes import split_explicit_title
 from sphinx.writers.text import TextWriter, TextTranslator
-from sphinx.writers.latex import LaTeXTranslator
 
 try:
     from sphinx.domains.python import PyFunction, PyMethod
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
@@ -31,10 +31,7 @@ the set are:
 More Python resources:
 
 * https://www.python.org:  The major Python web site.  It contains code,
-  documentation, and pointers to Python-related pages around the web.  This web
-  site is mirrored in various places around the world, such as Europe, Japan, and
-  Australia; a mirror may be faster than the main site, depending on your
-  geographical location.
+  documentation, and pointers to Python-related pages around the web.
 
 * https://docs.python.org:  Fast access to Python's  documentation.
 
diff --git a/Lib/random.py b/Lib/random.py
@@ -50,7 +50,7 @@
 from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin
 from math import tau as TWOPI, floor as _floor, isfinite as _isfinite
 from os import urandom as _urandom
-from _collections_abc import Set as _Set, Sequence as _Sequence
+from _collections_abc import Sequence as _Sequence
 from operator import index as _index
 from itertools import accumulate as _accumulate, repeat as _repeat
 from bisect import bisect as _bisect
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
@@ -9,7 +9,6 @@
 import socket
 import stat
 import sys
-import tempfile
 import threading
 import unittest
 from unittest import mock
diff --git a/Lib/test/test_ctypes/test_parameters.py b/Lib/test/test_ctypes/test_parameters.py
@@ -5,7 +5,6 @@
 class SimpleTypesTestCase(unittest.TestCase):
 
     def setUp(self):
-        import ctypes
         try:
             from _ctypes import set_conversion_mode
         except ImportError:
diff --git a/Lib/test/test_sqlite3/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py
@@ -20,7 +20,7 @@
 #    misrepresented as being the original software.
 # 3. This notice may not be removed or altered from any source distribution.
 
-import os, unittest
+import unittest
 import sqlite3 as sqlite
 
 from test.support import LOOPBACK_TIMEOUT
diff --git a/Lib/test/test_unittest/test_program.py b/Lib/test/test_unittest/test_program.py
@@ -1,5 +1,3 @@
-import io
-
 import os
 import sys
 import subprocess
diff --git a/Lib/test/test_unittest/test_result.py b/Lib/test/test_unittest/test_result.py
@@ -2,7 +2,7 @@
 import sys
 import textwrap
 
-from test.support import warnings_helper, captured_stdout, captured_stderr
+from test.support import warnings_helper, captured_stdout
 
 import traceback
 import unittest
diff --git a/Lib/tkinter/test/support.py b/Lib/tkinter/test/support.py
@@ -1,5 +1,4 @@
 import functools
-import re
 import tkinter
 import unittest
 
diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/tkinter/test/widget_tests.py
@@ -1,6 +1,5 @@
 # Common tests for test_tkinter/test_widgets.py and test_ttk/test_widgets.py
 
-import unittest
 import tkinter
 from tkinter.test.support import (AbstractTkTest, tcl_version,
                                   pixels_conv, tcl_obj_eq)
diff --git a/Misc/NEWS.d/next/Tests/2022-03-14-23-28-17.bpo-47016.K-t2QX.rst b/Misc/NEWS.d/next/Tests/2022-03-14-23-28-17.bpo-47016.K-t2QX.rst
@@ -0,0 +1,2 @@
+Create a GitHub Actions workflow for verifying bundled pip and setuptools.
+Patch by Illia Volochii and Adam Turner.
diff --git a/PC/layout/main.py b/PC/layout/main.py
@@ -8,11 +8,8 @@
 __version__ = "3.8"
 
 import argparse
-import functools
 import os
-import re
 import shutil
-import subprocess
 import sys
 import tempfile
 import zipfile
diff --git a/PC/layout/support/appxmanifest.py b/PC/layout/support/appxmanifest.py
@@ -6,13 +6,11 @@
 __version__ = "3.8"
 
 
-import collections
 import ctypes
 import io
 import os
-import sys
 
-from pathlib import Path, PureWindowsPath
+from pathlib import PureWindowsPath
 from xml.etree import ElementTree as ET
 
 from .constants import *
diff --git a/PC/layout/support/catalog.py b/PC/layout/support/catalog.py
@@ -6,8 +6,6 @@
 __version__ = "3.8"
 
 
-import sys
-
 __all__ = ["PYTHON_CAT_NAME", "PYTHON_CDF_NAME"]
 
 
diff --git a/PC/layout/support/constants.py b/PC/layout/support/constants.py
@@ -6,7 +6,6 @@
 __version__ = "3.8"
 
 import os
-import re
 import struct
 import sys
 
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -1,7 +1,6 @@
 #! /usr/bin/env python
 """Generate C code from an ASDL description."""
 
-import os
 import sys
 import textwrap
 import types
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
@@ -22,7 +22,6 @@
 import shlex
 import string
 import sys
-import tempfile
 import textwrap
 import traceback
 import types
diff --git a/Tools/peg_generator/pegen/grammar.py b/Tools/peg_generator/pegen/grammar.py
@@ -1,23 +1,16 @@
 from __future__ import annotations
 
-from abc import abstractmethod
 from typing import (
-    TYPE_CHECKING,
     AbstractSet,
     Any,
-    Dict,
     Iterable,
     Iterator,
     List,
     Optional,
-    Set,
     Tuple,
     Union,
 )
 
-if TYPE_CHECKING:
-    from pegen.parser_generator import ParserGenerator
-
 
 class GrammarError(Exception):
     pass
diff --git a/Tools/peg_generator/scripts/grammar_grapher.py b/Tools/peg_generator/scripts/grammar_grapher.py
@@ -30,7 +30,6 @@
     Alt,
     Cut,
     Forced,
-    Grammar,
     Group,
     Leaf,
     Lookahead,
diff --git a/Tools/peg_generator/scripts/test_parse_directory.py b/Tools/peg_generator/scripts/test_parse_directory.py
@@ -5,15 +5,13 @@
 import os
 import sys
 import time
-import traceback
 import tokenize
 from glob import glob, escape
 from pathlib import PurePath
 
 from typing import List, Optional, Any, Tuple
 
 sys.path.insert(0, os.getcwd())
-from pegen.ast_dump import ast_dump
 from pegen.testutil import print_memstats
 
 SUCCESS = "\033[92m"
diff --git a/Tools/peg_generator/scripts/test_pypi_packages.py b/Tools/peg_generator/scripts/test_pypi_packages.py
@@ -9,11 +9,10 @@
 import pathlib
 import sys
 
-from typing import Generator, Any
+from typing import Generator
 
 sys.path.insert(0, ".")
 
-from pegen import build
 from scripts import test_parse_directory
 
 HERE = pathlib.Path(__file__).resolve().parent
diff --git a/Tools/scripts/freeze_modules.py b/Tools/scripts/freeze_modules.py
@@ -8,7 +8,6 @@
 import os
 import ntpath
 import posixpath
-import sys
 import argparse
 from update_file import updating_file_with_tmpfile
 
diff --git a/Tools/scripts/generate_re_casefix.py b/Tools/scripts/generate_re_casefix.py
@@ -2,7 +2,6 @@
 # This script generates Lib/re/_casefix.py.
 
 import collections
-import re
 import sys
 import unicodedata
 
diff --git a/Tools/scripts/pathfix.py b/Tools/scripts/pathfix.py
@@ -27,7 +27,6 @@
 # into a program for a different change to Python programs...
 
 import sys
-import re
 import os
 from stat import *
 import getopt
diff --git a/Tools/scripts/stable_abi.py b/Tools/scripts/stable_abi.py
@@ -16,7 +16,6 @@
 import textwrap
 import tomllib
 import difflib
-import shutil
 import pprint
 import sys
 import os
diff --git a/Tools/scripts/summarize_stats.py b/Tools/scripts/summarize_stats.py
@@ -7,7 +7,6 @@
 import opcode
 from datetime import date
 import itertools
-import argparse
 import sys
 
 if os.name == "nt":
diff --git a/Tools/scripts/verify_ensurepip_wheels.py b/Tools/scripts/verify_ensurepip_wheels.py
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
