https://github.com/python/cpython/commit/e9f4d80fa66e0d3331e79d539329747297e54ae5
commit: e9f4d80fa66e0d3331e79d539329747297e54ae5
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2024-06-18T15:51:47Z
summary:
gh-120417: Add #noqa: F401 to tests (#120627)
Ignore linter "imported but unused" warnings in tests when the linter
doesn't understand how the import is used.
files:
M Lib/test/support/__init__.py
M Lib/test/test___all__.py
M Lib/test/test_asyncio/test_tasks.py
M Lib/test/test_capi/check_config.py
M Lib/test/test_cmd_line.py
M Lib/test/test_codecs.py
M Lib/test/test_compile.py
M Lib/test/test_compileall.py
M Lib/test/test_descrtut.py
M Lib/test/test_file_eintr.py
M Lib/test/test_future_stmt/nested_scope.py
M Lib/test/test_future_stmt/test_future.py
M Lib/test/test_inspect/test_inspect.py
M Lib/test/test_pkg.py
M Lib/test/test_pydoc/test_pydoc.py
M Lib/test/test_re.py
M Lib/test/test_site.py
M Lib/test/test_sundry.py
M Lib/test/test_support.py
M Lib/test/test_unicode_identifiers.py
M Lib/test/test_utf8source.py
M Lib/test/test_warnings/__init__.py
M Lib/test/test_xml_etree.py
M Lib/test/test_xmlrpc.py
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index a045c88d7f4af0..4b430f85e7175c 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1221,8 +1221,8 @@ def refcount_test(test):
def requires_limited_api(test):
try:
- import _testcapi
- import _testlimitedcapi
+ import _testcapi # noqa: F401
+ import _testlimitedcapi # noqa: F401
except ImportError:
return unittest.skip('needs _testcapi and _testlimitedcapi
modules')(test)
return test
@@ -2299,7 +2299,7 @@ def clear_ignored_deprecations(*tokens: object) -> None:
def requires_venv_with_pip():
# ensurepip requires zlib to open ZIP archives (.whl binary wheel packages)
try:
- import zlib
+ import zlib # noqa: F401
except ImportError:
return unittest.skipIf(True, "venv: ensurepip requires zlib")
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index b40622efe4611e..e405056c8ffcb5 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -103,7 +103,7 @@ def test_all(self):
# In case _socket fails to build, make this test fail more gracefully
# than an AttributeError somewhere deep in concurrent.futures, email
# or unittest.
- import _socket
+ import _socket # noqa: F401
ignored = []
failed_imports = []
diff --git a/Lib/test/test_asyncio/test_tasks.py
b/Lib/test/test_asyncio/test_tasks.py
index 5b09c81faef62a..cc0d7f52a1bf4c 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -3103,14 +3103,14 @@ def test_asyncio_module_compiled(self):
# fail on systems where C modules were successfully compiled
# (hence the test for _functools etc), but _asyncio somehow didn't.
try:
- import _functools
- import _json
- import _pickle
+ import _functools # noqa: F401
+ import _json # noqa: F401
+ import _pickle # noqa: F401
except ImportError:
self.skipTest('C modules are not available')
else:
try:
- import _asyncio
+ import _asyncio # noqa: F401
except ImportError:
self.fail('_asyncio module is missing')
diff --git a/Lib/test/test_capi/check_config.py
b/Lib/test/test_capi/check_config.py
index eb99ae16f2b69e..bc4f3a0beb9c1e 100644
--- a/Lib/test/test_capi/check_config.py
+++ b/Lib/test/test_capi/check_config.py
@@ -10,7 +10,7 @@
def import_singlephase():
assert '_testsinglephase' not in sys.modules
try:
- import _testsinglephase
+ import _testsinglephase # noqa: F401
except ImportError:
sys.modules.pop('_testsinglephase', None)
return False
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 058470082fbbf0..8418da541fde8c 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -737,7 +737,7 @@ def test_xdev(self):
# Memory allocator debug hooks
try:
- import _testinternalcapi
+ import _testinternalcapi # noqa: F401
except ImportError:
pass
else:
@@ -754,7 +754,7 @@ def test_xdev(self):
# Faulthandler
try:
- import faulthandler
+ import faulthandler # noqa: F401
except ImportError:
pass
else:
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index e05b95c2d60bad..428036e1765b8f 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -2958,7 +2958,7 @@ def test_seek0(self):
bytes_transform_encodings.append("zlib_codec")
transform_aliases["zlib_codec"] = ["zip", "zlib"]
try:
- import bz2
+ import bz2 # noqa: F401
except ImportError:
pass
else:
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 219314b5ce3d6f..40295236eb7d92 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -441,8 +441,8 @@ class A:
def f():
__mangled = 1
__not_mangled__ = 2
- import __mangled_mod
- import __package__.module
+ import __mangled_mod # noqa: F401
+ import __package__.module # noqa: F401
self.assertIn("_A__mangled", A.f.__code__.co_varnames)
self.assertIn("__not_mangled__", A.f.__code__.co_varnames)
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 812ff5e7f84461..3a34c6822bc079 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -18,7 +18,7 @@
# compileall relies on ProcessPoolExecutor if ProcessPoolExecutor exists
# and it can function.
from multiprocessing.util import _cleanup_tests as
multiprocessing_cleanup_tests
- from concurrent.futures import ProcessPoolExecutor
+ from concurrent.futures import ProcessPoolExecutor # noqa: F401
from concurrent.futures.process import _check_system_limits
_check_system_limits()
_have_multiprocessing = True
diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py
index f097c4e7300baa..828440a993a975 100644
--- a/Lib/test/test_descrtut.py
+++ b/Lib/test/test_descrtut.py
@@ -8,7 +8,7 @@
# of much interest anymore), and a few were fiddled to make the output
# deterministic.
-from test.support import sortdict
+from test.support import sortdict # noqa: F401
import doctest
import unittest
diff --git a/Lib/test/test_file_eintr.py b/Lib/test/test_file_eintr.py
index f9236f45ca4be8..466f94e389f986 100644
--- a/Lib/test/test_file_eintr.py
+++ b/Lib/test/test_file_eintr.py
@@ -21,8 +21,8 @@
raise unittest.SkipTest("test module requires subprocess")
# Test import all of the things we're about to try testing up front.
-import _io
-import _pyio
+import _io # noqa: F401
+import _pyio # noqa: F401
@unittest.skipUnless(os.name == 'posix', 'tests requires a posix system.')
class TestFileIOSignalInterrupt:
diff --git a/Lib/test/test_future_stmt/nested_scope.py
b/Lib/test/test_future_stmt/nested_scope.py
index 3d7fc860a37655..a8433a42cbb6b0 100644
--- a/Lib/test/test_future_stmt/nested_scope.py
+++ b/Lib/test/test_future_stmt/nested_scope.py
@@ -1,6 +1,6 @@
"""This is a test"""
-from __future__ import nested_scopes; import site
+from __future__ import nested_scopes; import site # noqa: F401
def f(x):
def g(y):
diff --git a/Lib/test/test_future_stmt/test_future.py
b/Lib/test/test_future_stmt/test_future.py
index bb31d0a0023fad..44512e0101dac0 100644
--- a/Lib/test/test_future_stmt/test_future.py
+++ b/Lib/test/test_future_stmt/test_future.py
@@ -67,19 +67,19 @@ def test_future_single_import(self):
with import_helper.CleanImport(
'test.test_future_stmt.test_future_single_import',
):
- from test.test_future_stmt import test_future_single_import
+ from test.test_future_stmt import test_future_single_import #
noqa: F401
def test_future_multiple_imports(self):
with import_helper.CleanImport(
'test.test_future_stmt.test_future_multiple_imports',
):
- from test.test_future_stmt import test_future_multiple_imports
+ from test.test_future_stmt import test_future_multiple_imports #
noqa: F401
def test_future_multiple_features(self):
with import_helper.CleanImport(
"test.test_future_stmt.test_future_multiple_features",
):
- from test.test_future_stmt import test_future_multiple_features
+ from test.test_future_stmt import test_future_multiple_features #
noqa: F401
def test_unknown_future_flag(self):
code = """
@@ -153,7 +153,7 @@ def test_future_import_braces(self):
def test_module_with_future_import_not_on_top(self):
with self.assertRaises(SyntaxError) as cm:
- from test.test_future_stmt import badsyntax_future
+ from test.test_future_stmt import badsyntax_future # noqa: F401
self.check_syntax_error(cm.exception, "badsyntax_future", lineno=3)
def test_ensure_flags_dont_clash(self):
diff --git a/Lib/test/test_inspect/test_inspect.py
b/Lib/test/test_inspect/test_inspect.py
index 88835cd79aad7f..1ade4bbdd53e67 100644
--- a/Lib/test/test_inspect/test_inspect.py
+++ b/Lib/test/test_inspect/test_inspect.py
@@ -1287,7 +1287,7 @@ def test_getfullargspec_builtin_func_no_signature(self):
(dict.__class_getitem__, meth_type_o),
]
try:
- import _stat
+ import _stat # noqa: F401
except ImportError:
# if the _stat extension is not available, stat.S_IMODE() is
# implemented in Python, not in C
@@ -3303,7 +3303,7 @@ def test_signature_on_builtins_no_signature(self):
(dict.__class_getitem__, meth_o),
]
try:
- import _stat
+ import _stat # noqa: F401
except ImportError:
# if the _stat extension is not available, stat.S_IMODE() is
# implemented in Python, not in C
diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py
index eed0fd1c6b73fa..a7a1c2affbe1fb 100644
--- a/Lib/test/test_pkg.py
+++ b/Lib/test/test_pkg.py
@@ -94,7 +94,7 @@ def mkhier(self, descr):
def test_1(self):
hier = [("t1", None), ("t1 __init__.py", "")]
self.mkhier(hier)
- import t1
+ import t1 # noqa: F401
def test_2(self):
hier = [
@@ -124,7 +124,7 @@ def test_2(self):
from t2 import sub
from t2.sub import subsub
- from t2.sub.subsub import spam
+ from t2.sub.subsub import spam # noqa: F401
self.assertEqual(sub.__name__, "t2.sub")
self.assertEqual(subsub.__name__, "t2.sub.subsub")
self.assertEqual(sub.subsub.__name__, "t2.sub.subsub")
diff --git a/Lib/test/test_pydoc/test_pydoc.py
b/Lib/test/test_pydoc/test_pydoc.py
index bffebf38e1f9b2..40b3aca25e0da8 100644
--- a/Lib/test/test_pydoc/test_pydoc.py
+++ b/Lib/test/test_pydoc/test_pydoc.py
@@ -1239,7 +1239,8 @@ def test_url_search_package_error(self):
sys.path.insert(0, TESTFN)
try:
with self.assertRaisesRegex(ValueError, "ouch"):
- import test_error_package # Sanity check
+ # Sanity check
+ import test_error_package # noqa: F401
text = self.call_url_handler("search?key=test_error_package",
"Pydoc: Search Results")
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index d8c839da3d2946..1f2ab6028b588e 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -13,7 +13,7 @@
# some platforms lack working multiprocessing
try:
- import _multiprocessing
+ import _multiprocessing # noqa: F401
except ImportError:
multiprocessing = None
else:
@@ -1228,7 +1228,7 @@ def test_pickling(self):
newpat = pickle.loads(pickled)
self.assertEqual(newpat, oldpat)
# current pickle expects the _compile() reconstructor in re module
- from re import _compile
+ from re import _compile # noqa: F401
def test_copying(self):
import copy
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 0502181854f52b..bcdc232c712071 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -513,7 +513,7 @@ def test_sitecustomize_executed(self):
# If sitecustomize is available, it should have been imported.
if "sitecustomize" not in sys.modules:
try:
- import sitecustomize
+ import sitecustomize # noqa: F401
except ImportError:
pass
else:
diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index f4a8d434ed1b8c..d6d08ee53f821c 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -18,10 +18,11 @@ def test_untested_modules_can_be_imported(self):
self.fail('{} has tests even though test_sundry claims '
'otherwise'.format(name))
- import html.entities
+ import html.entities # noqa: F401
try:
- import tty # Not available on Windows
+ # Not available on Windows
+ import tty # noqa: F401
except ImportError:
if support.verbose:
print("skipping tty")
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index d160cbf0645b47..d6f024a476920c 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -70,7 +70,7 @@ def test_get_original_stdout(self):
self.assertEqual(support.get_original_stdout(), sys.stdout)
def test_unload(self):
- import sched
+ import sched # noqa: F401
self.assertIn("sched", sys.modules)
import_helper.unload("sched")
self.assertNotIn("sched", sys.modules)
diff --git a/Lib/test/test_unicode_identifiers.py
b/Lib/test/test_unicode_identifiers.py
index 63c6c055824b20..3680072d643792 100644
--- a/Lib/test/test_unicode_identifiers.py
+++ b/Lib/test/test_unicode_identifiers.py
@@ -19,7 +19,7 @@ def test_non_bmp_normalized(self):
def test_invalid(self):
try:
- from test.tokenizedata import badsyntax_3131
+ from test.tokenizedata import badsyntax_3131 # noqa: F401
except SyntaxError as err:
self.assertEqual(str(err),
"invalid character '€' (U+20AC) (badsyntax_3131.py, line 2)")
diff --git a/Lib/test/test_utf8source.py b/Lib/test/test_utf8source.py
index c42b6aaaab579d..7336cf00a71183 100644
--- a/Lib/test/test_utf8source.py
+++ b/Lib/test/test_utf8source.py
@@ -14,7 +14,7 @@ def test_pep3120(self):
def test_badsyntax(self):
try:
- import test.tokenizedata.badsyntax_pep3120
+ import test.tokenizedata.badsyntax_pep3120 # noqa: F401
except SyntaxError as msg:
msg = str(msg).lower()
self.assertTrue('utf-8' in msg)
diff --git a/Lib/test/test_warnings/__init__.py
b/Lib/test/test_warnings/__init__.py
index 4416ed0f3ed3ef..36618d509fafe1 100644
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -499,7 +499,7 @@ def test_stacklevel_import(self):
with original_warnings.catch_warnings(record=True,
module=self.module) as w:
self.module.simplefilter('always')
- import test.test_warnings.data.import_warning
+ import test.test_warnings.data.import_warning # noqa: F401
self.assertEqual(len(w), 1)
self.assertEqual(w[0].filename, __file__)
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 3d9141fea1ef3e..930501633d1f38 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -138,9 +138,9 @@ class ModuleTest(unittest.TestCase):
def test_sanity(self):
# Import sanity.
- from xml.etree import ElementTree
- from xml.etree import ElementInclude
- from xml.etree import ElementPath
+ from xml.etree import ElementTree # noqa: F401
+ from xml.etree import ElementInclude # noqa: F401
+ from xml.etree import ElementPath # noqa: F401
def test_all(self):
names = ("xml.etree.ElementTree", "_elementtree")
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 6c4b8384a3202e..2803c6d45c27bf 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -308,7 +308,7 @@ def test_get_host_info(self):
def test_ssl_presence(self):
try:
- import ssl
+ import ssl # noqa: F401
except ImportError:
has_ssl = False
else:
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
