diff --git a/Lib/test/test_zipfile/test_core.py b/Lib/test/test_zipfile/test_core.py index a51764b9297363..609a8a9af0fafe 100644 --- a/Lib/test/test_zipfile/test_core.py +++ b/Lib/test/test_zipfile/test_core.py @@ -13,6 +13,7 @@ import unittest import unittest.mock as mock import zipfile +import zipfile.__main__ as zipfile_main from tempfile import TemporaryFile @@ -3184,16 +3185,16 @@ def test_cli_with_metadata_encoding(self): args = ["--metadata-encoding=shift_jis", "-c", "nonesuch", "nonesuch"] with captured_stdout() as stdout: with captured_stderr() as stderr: - self.assertRaises(SystemExit, zipfile.main, args) + self.assertRaises(SystemExit, zipfile_main.main, args) self.assertEqual(stdout.getvalue(), "") self.assertIn(errmsg, stderr.getvalue()) with captured_stdout() as stdout: - zipfile.main(["--metadata-encoding=shift_jis", "-t", TESTFN]) + zipfile_main.main(["--metadata-encoding=shift_jis", "-t", TESTFN]) listing = stdout.getvalue() with captured_stdout() as stdout: - zipfile.main(["--metadata-encoding=shift_jis", "-l", TESTFN]) + zipfile_main.main(["--metadata-encoding=shift_jis", "-l", TESTFN]) listing = stdout.getvalue() for name in self.file_names: self.assertIn(name, listing) @@ -3211,7 +3212,7 @@ def test_cli_with_metadata_encoding_extract(self): except UnicodeEncodeError: self.skipTest(f'cannot encode file name {fn!r}') - zipfile.main(["--metadata-encoding=shift_jis", "-e", TESTFN, TESTFN2]) + zipfile_main.main(["--metadata-encoding=shift_jis", "-e", TESTFN, TESTFN2]) listing = os.listdir(TESTFN2) for name in self.file_names: self.assertIn(name, listing) diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py index 2b28a079dbaa95..e1e7d86afbae58 100644 --- a/Lib/zipfile/__init__.py +++ b/Lib/zipfile/__init__.py @@ -2233,6 +2233,3 @@ def _compile(file, optimize=-1): # used privately for tests CompleteDirs, # noqa: F401 ) - -# used privately for tests -from .__main__ import main # noqa: F401, E402