https://github.com/python/cpython/commit/f5a7037c32b01197e8a0dd561783ab6168edbb1c
commit: f5a7037c32b01197e8a0dd561783ab6168edbb1c
branch: main
author: Bénédikt Tran <10796600+picn...@users.noreply.github.com>
committer: picnixz <10796600+picn...@users.noreply.github.com>
date: 2025-04-08T15:03:43+02:00
summary:
gh-93096: fix `test_mimetypes.test_invocation_error` tests on iOS ARM64
(#132266)
files:
M Lib/mimetypes.py
M Lib/test/test_mimetypes.py
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 67660e4f0368ce..7c3e9c0d1159ba 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -706,7 +706,7 @@ def _main(args=None):
if guess:
return f"type: {guess} encoding: {encoding}"
sys.exit(f"error: media type unknown for {gtype}")
- return parser.format_help()
+ return help_text
if __name__ == '__main__':
diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py
index 2da1c13800e875..261017f832a2af 100644
--- a/Lib/test/test_mimetypes.py
+++ b/Lib/test/test_mimetypes.py
@@ -417,7 +417,6 @@ def test_parse_args(self):
self.assertFalse(args.lenient)
self.assertEqual(args.type, ["foo.pic"])
-
def test_invocation(self):
for command, expected in [
("-l -e image/jpg", ".jpg"),
@@ -426,14 +425,14 @@ def test_invocation(self):
]:
self.assertEqual(mimetypes._main(shlex.split(command)), expected)
-
def test_invocation_error(self):
for command, expected in [
("-e image/jpg", "error: unknown type image/jpg"),
- ("foo.pic", "error: media type unknown for foo.pic"),
+ ("foo.bar_ext", "error: media type unknown for foo.bar_ext"),
]:
- with self.assertRaisesRegex(SystemExit, expected):
- mimetypes._main(shlex.split(command))
+ with self.subTest(command=command):
+ with self.assertRaisesRegex(SystemExit, expected):
+ mimetypes._main(shlex.split(command))
if __name__ == "__main__":
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
