From 4df553973588b4b85c71676d5b349fd7e508b7fd Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 30 Apr 2020 16:26:54 +0200 Subject: [PATCH 1/2] bpo-40443: Remove unused imports in stdlib --- Lib/importlib/resources.py | 3 +-- Lib/multiprocessing/pool.py | 1 - Lib/multiprocessing/util.py | 1 - Lib/ssl.py | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Lib/importlib/resources.py b/Lib/importlib/resources.py index fc3a1c9cabe636..f51886557466c7 100644 --- a/Lib/importlib/resources.py +++ b/Lib/importlib/resources.py @@ -8,10 +8,9 @@ from io import BytesIO, TextIOWrapper from pathlib import Path from types import ModuleType -from typing import Iterable, Iterator, Optional, Set, Union # noqa: F401 +from typing import Iterable, Iterator, Optional, Union # noqa: F401 from typing import cast from typing.io import BinaryIO, TextIO -from zipimport import ZipImportError __all__ = [ diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py index b8a0b827635f07..bbe05a550c349c 100644 --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -22,7 +22,6 @@ import traceback import types import warnings -from queue import Empty # If threading is available then ThreadPool should be provided. Therefore # we avoid top-level imports which are liable to fail on some systems. diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py index 21f2a7ebe25002..6c230eda566782 100644 --- a/Lib/multiprocessing/util.py +++ b/Lib/multiprocessing/util.py @@ -14,7 +14,6 @@ import atexit import threading # we want threading to install it's # cleanup function before multiprocessing does -from subprocess import _args_from_interpreter_flags from . import process diff --git a/Lib/ssl.py b/Lib/ssl.py index 0726caee49aa57..30f4e5934febf9 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -252,7 +252,7 @@ class _TLSMessageType(_IntEnum): if sys.platform == "win32": from _ssl import enum_certificates, enum_crls -from socket import socket, AF_INET, SOCK_STREAM, create_connection +from socket import socket, SOCK_STREAM, create_connection from socket import SOL_SOCKET, SO_TYPE import socket as _socket import base64 # for DER-to-PEM translation From d137ce9a8468fa35055277f0c4267449ec7d9ff9 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 1 May 2020 00:22:03 +0200 Subject: [PATCH 2/2] Revert multiprocessing.util change --- Lib/multiprocessing/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py index 6c230eda566782..21f2a7ebe25002 100644 --- a/Lib/multiprocessing/util.py +++ b/Lib/multiprocessing/util.py @@ -14,6 +14,7 @@ import atexit import threading # we want threading to install it's # cleanup function before multiprocessing does +from subprocess import _args_from_interpreter_flags from . import process