Skip to content

Commit

Permalink
pythongh-112578: Fix RuntimeWarning when running zipfile
Browse files Browse the repository at this point in the history
  • Loading branch information
hauntsaninja committed Dec 1, 2023
1 parent e44f194 commit 13d4671
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
9 changes: 5 additions & 4 deletions Lib/test/test_zipfile/test_core.py
Expand Up @@ -13,6 +13,7 @@
import unittest
import unittest.mock as mock
import zipfile
import zipfile.__main__ as zipfile_main


from tempfile import TemporaryFile
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions Lib/zipfile/__init__.py
Expand Up @@ -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

0 comments on commit 13d4671

Please sign in to comment.