Skip to content

Commit

Permalink
pythongh-120417: Add #noqa: F401 to tests (python#120627)
Browse files Browse the repository at this point in the history
Ignore linter "imported but unused" warnings in tests when the linter
doesn't understand how the import is used.
  • Loading branch information
vstinner authored and estyxx committed Jul 17, 2024
1 parent f6267d7 commit 60df5cc
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 41 deletions.
6 changes: 3 additions & 3 deletions Lib/test/support/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test___all__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_asyncio/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_capi/check_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_cmd_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ def test_xdev(self):

# Memory allocator debug hooks
try:
import _testinternalcapi
import _testinternalcapi # noqa: F401
except ImportError:
pass
else:
Expand All @@ -754,7 +754,7 @@ def test_xdev(self):

# Faulthandler
try:
import faulthandler
import faulthandler # noqa: F401
except ImportError:
pass
else:
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_codecs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_compileall.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_descrtut.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_file_eintr.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_future_stmt/nested_scope.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_future_stmt/test_future.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = """
Expand Down Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_inspect/test_inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_pkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_pydoc/test_pydoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_re.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# some platforms lack working multiprocessing
try:
import _multiprocessing
import _multiprocessing # noqa: F401
except ImportError:
multiprocessing = None
else:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions Lib/test/test_sundry.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_unicode_identifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)")
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_utf8source.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_warnings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_xml_etree.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_xmlrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 60df5cc

Please sign in to comment.