Skip to content

Commit fc384b1

Browse files
vstinnervstinner
committed
pythongh-120417: Add more #noqa to used imports in the stdlib
Tools such as ruff can ignore "imported but unused" warnings if a line ends with "# noqa: F401". It avoids the temptation to remove an import which is used effectively.
1 parent 6ae254a commit fc384b1

File tree

7 files changed

+46
-46
lines changed

7 files changed

+46
-46
lines changed

‎Lib/collections/abc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from _collections_abc import *
2-
from _collections_abc import __all__
3-
from _collections_abc import _CallableGenericAlias
2+
from _collections_abc import __all__ # noqa: F401
3+
from _collections_abc import _CallableGenericAlias # noqa: F401

‎Lib/ctypes/__init__.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
__version__ = "1.1.0"
77

8-
from _ctypes import Union, Structure, Array
9-
from _ctypes import _Pointer
8+
from _ctypes import Union, Structure, Array # noqa: F401
9+
from _ctypes import _Pointer # noqa: F401
1010
from _ctypes import CFuncPtr as _CFuncPtr
1111
from _ctypes import __version__ as _ctypes_version
1212
from _ctypes import RTLD_LOCAL, RTLD_GLOBAL
13-
from _ctypes import ArgumentError
13+
from _ctypes import ArgumentError # noqa: F401
1414
from _ctypes import SIZEOF_TIME_T
1515

1616
from struct import calcsize as _calcsize
@@ -138,8 +138,8 @@ class WinFunctionType(_CFuncPtr):
138138
elif _os.name == "posix":
139139
from _ctypes import dlopen as _dlopen
140140

141-
from _ctypes import sizeof, byref, addressof, alignment, resize
142-
from _ctypes import get_errno, set_errno
141+
from _ctypes import sizeof, byref, addressof, alignment, resize # noqa: F401
142+
from _ctypes import get_errno, set_errno # noqa: F401
143143
from _ctypes import _SimpleCData
144144

145145
def _check_size(typ, typecode=None):
@@ -252,7 +252,7 @@ class c_void_p(_SimpleCData):
252252
class c_bool(_SimpleCData):
253253
_type_ = "?"
254254

255-
from _ctypes import POINTER, pointer, _pointer_type_cache
255+
from _ctypes import POINTER, pointer, _pointer_type_cache # noqa: F401
256256

257257
class c_wchar_p(_SimpleCData):
258258
_type_ = "Z"
@@ -492,7 +492,7 @@ def LoadLibrary(self, name):
492492
oledll = LibraryLoader(OleDLL)
493493

494494
GetLastError = windll.kernel32.GetLastError
495-
from _ctypes import get_last_error, set_last_error
495+
from _ctypes import get_last_error, set_last_error # noqa: F401
496496

497497
def WinError(code=None, descr=None):
498498
if code is None:
@@ -568,8 +568,8 @@ def DllCanUnloadNow():
568568
return 0 # S_OK
569569
return ccom.DllCanUnloadNow()
570570

571-
from ctypes._endian import BigEndianStructure, LittleEndianStructure
572-
from ctypes._endian import BigEndianUnion, LittleEndianUnion
571+
from ctypes._endian import BigEndianStructure, LittleEndianStructure # noqa: F401
572+
from ctypes._endian import BigEndianUnion, LittleEndianUnion # noqa: F401
573573

574574
# Fill in specifically-sized types
575575
c_int8 = c_byte

‎Lib/importlib/machinery.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
"""The machinery of importlib: finders, loaders, hooks, etc."""
22

3-
from ._bootstrap import ModuleSpec
4-
from ._bootstrap import BuiltinImporter
5-
from ._bootstrap import FrozenImporter
6-
from ._bootstrap_external import (SOURCE_SUFFIXES, DEBUG_BYTECODE_SUFFIXES,
3+
from ._bootstrap import ModuleSpec # noqa: F401
4+
from ._bootstrap import BuiltinImporter # noqa: F401
5+
from ._bootstrap import FrozenImporter # noqa: F401
6+
from ._bootstrap_external import (SOURCE_SUFFIXES, DEBUG_BYTECODE_SUFFIXES, # noqa: F401
77
OPTIMIZED_BYTECODE_SUFFIXES, BYTECODE_SUFFIXES,
88
EXTENSION_SUFFIXES)
9-
from ._bootstrap_external import WindowsRegistryFinder
10-
from ._bootstrap_external import PathFinder
11-
from ._bootstrap_external import FileFinder
12-
from ._bootstrap_external import SourceFileLoader
13-
from ._bootstrap_external import SourcelessFileLoader
14-
from ._bootstrap_external import ExtensionFileLoader
15-
from ._bootstrap_external import AppleFrameworkLoader
16-
from ._bootstrap_external import NamespaceLoader
9+
from ._bootstrap_external import WindowsRegistryFinder # noqa: F401
10+
from ._bootstrap_external import PathFinder # noqa: F401
11+
from ._bootstrap_external import FileFinder # noqa: F401
12+
from ._bootstrap_external import SourceFileLoader # noqa: F401
13+
from ._bootstrap_external import SourcelessFileLoader # noqa: F401
14+
from ._bootstrap_external import ExtensionFileLoader # noqa: F401
15+
from ._bootstrap_external import AppleFrameworkLoader # noqa: F401
16+
from ._bootstrap_external import NamespaceLoader # noqa: F401
1717

1818

1919
def all_suffixes():

‎Lib/importlib/util.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"""Utility code for constructing importers, etc."""
22
from ._abc import Loader
3-
from ._bootstrap import module_from_spec
3+
from ._bootstrap import module_from_spec # noqa: F401
44
from ._bootstrap import _resolve_name
5-
from ._bootstrap import spec_from_loader
5+
from ._bootstrap import spec_from_loader # noqa: F401
66
from ._bootstrap import _find_spec
7-
from ._bootstrap_external import MAGIC_NUMBER
7+
from ._bootstrap_external import MAGIC_NUMBER # noqa: F401
88
from ._bootstrap_external import _RAW_MAGIC_NUMBER
9-
from ._bootstrap_external import cache_from_source
10-
from ._bootstrap_external import decode_source
11-
from ._bootstrap_external import source_from_cache
12-
from ._bootstrap_external import spec_from_file_location
9+
from ._bootstrap_external import cache_from_source # noqa: F401
10+
from ._bootstrap_external import decode_source # noqa: F401
11+
from ._bootstrap_external import source_from_cache # noqa: F401
12+
from ._bootstrap_external import spec_from_file_location # noqa: F401
1313

1414
import _imp
1515
import sys

‎Lib/ssl.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,26 @@
9999

100100
import _ssl # if we can't import it, let the error propagate
101101

102-
from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION
103-
from _ssl import _SSLContext, MemoryBIO, SSLSession
102+
from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION # noqa: F401
103+
from _ssl import _SSLContext, MemoryBIO, SSLSession # noqa: F401
104104
from _ssl import (
105-
SSLError, SSLZeroReturnError, SSLWantReadError, SSLWantWriteError,
106-
SSLSyscallError, SSLEOFError, SSLCertVerificationError
105+
SSLError, SSLZeroReturnError, SSLWantReadError, SSLWantWriteError, # noqa: F401
106+
SSLSyscallError, SSLEOFError, SSLCertVerificationError # noqa: F401
107107
)
108108
from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj
109-
from _ssl import RAND_status, RAND_add, RAND_bytes
109+
from _ssl import RAND_status, RAND_add, RAND_bytes # noqa: F401
110110
try:
111-
from _ssl import RAND_egd
111+
from _ssl import RAND_egd # noqa: F401
112112
except ImportError:
113113
# RAND_egd is not supported on some platforms
114114
pass
115115

116116

117117
from _ssl import (
118-
HAS_SNI, HAS_ECDH, HAS_NPN, HAS_ALPN, HAS_SSLv2, HAS_SSLv3, HAS_TLSv1,
119-
HAS_TLSv1_1, HAS_TLSv1_2, HAS_TLSv1_3, HAS_PSK
118+
HAS_SNI, HAS_ECDH, HAS_NPN, HAS_ALPN, HAS_SSLv2, HAS_SSLv3, HAS_TLSv1, # noqa: F401
119+
HAS_TLSv1_1, HAS_TLSv1_2, HAS_TLSv1_3, HAS_PSK # noqa: F401
120120
)
121-
from _ssl import _DEFAULT_CIPHERS, _OPENSSL_API_VERSION
121+
from _ssl import _DEFAULT_CIPHERS, _OPENSSL_API_VERSION # noqa: F401
122122

123123
_IntEnum._convert_(
124124
'_SSLMethod', __name__,
@@ -255,7 +255,7 @@ class _TLSMessageType:
255255

256256

257257
if sys.platform == "win32":
258-
from _ssl import enum_certificates, enum_crls
258+
from _ssl import enum_certificates, enum_crls # noqa: F401
259259

260260
from socket import socket, SOCK_STREAM, create_connection
261261
from socket import SOL_SOCKET, SO_TYPE, _GLOBAL_DEFAULT_TIMEOUT

‎Lib/subprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
if _mswindows:
8181
import _winapi
82-
from _winapi import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP,
82+
from _winapi import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP, # noqa: F401
8383
STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
8484
STD_ERROR_HANDLE, SW_HIDE,
8585
STARTF_USESTDHANDLES, STARTF_USESHOWWINDOW,

‎Lib/xml/sax/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"""
2121

2222
from .xmlreader import InputSource
23-
from .handler import ContentHandler, ErrorHandler
24-
from ._exceptions import SAXException, SAXNotRecognizedException, \
25-
SAXParseException, SAXNotSupportedException, \
26-
SAXReaderNotAvailable
23+
from .handler import ContentHandler, ErrorHandler # noqa: F401
24+
from ._exceptions import (SAXException, SAXNotRecognizedException, # noqa: F401
25+
SAXParseException, SAXNotSupportedException, # noqa: F401
26+
SAXReaderNotAvailable) # noqa: F401
2727

2828

2929
def parse(source, handler, errorHandler=ErrorHandler()):
@@ -55,7 +55,7 @@ def parseString(string, handler, errorHandler=ErrorHandler()):
5555
# tell modulefinder that importing sax potentially imports expatreader
5656
_false = 0
5757
if _false:
58-
import xml.sax.expatreader
58+
import xml.sax.expatreader # noqa: F401
5959

6060
import os, sys
6161
if not sys.flags.ignore_environment and "PY_SAX_PARSER" in os.environ:

0 commit comments

Comments
 (0)