gh-136507: Fix mimetypes CLI to handle multiple file parameters #136508
Conversation
|
Supplement: #136507 (comment) , so this only in 3.14 and 3.15. CC: @hugovk could you review this? |
|
It's probably a good idea to add both success and failure test case for the multiple provided values (e.g., |
|
Could you also test the failure case? |
Misc/NEWS.d/next/Library/2025-07-10-21-02-43.gh-issue-136507.pnEuGS.rst
Outdated
Show resolved
Hide resolved
Sorry, I might not have understood it well. 9500cb3 Run this test was failing before the fix, now it runs pass after the fix |
…nEuGS.rst Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Lib/mimetypes.py
Outdated
| results.append(f"type: {guess} encoding: {encoding}") | ||
| else: | ||
| sys.exit(f"error: media type unknown for {gtype}") | ||
| return '\n'.join(results) | ||
| return help_text |
There was a problem hiding this comment.
Is return help_text line used?
Either:
- delete
return help_text(that branch of the code is never used) - change
return help_texttoreturn "\n".join(results)and delete the otherreturncalls at the end of eachfor type in args.typeblock.
There was a problem hiding this comment.
not used, IDE already given a hint
In addition, test failure case have been added
I believe there needs to be a test for the Note that this appears to be slightly changing the interface from a streaming model to a fail fast on the first error case. |
|
With this PR we get both results when successful: ❯ ./python.exe -m mimetypes 1.pdf 1.png
type: application/pdf encoding: None
type: image/png encoding: NoneOr if it fails on the last one: ❯ ./python.exe -m mimetypes 1.pdf 1.pnx
type: application/pdf encoding: None
error: media type unknown for 1.pnxBut not if it fails on the first one (or both): ❯ ./python.exe -m mimetypes 1.pdx 1.pnx
error: media type unknown for 1.pdxShall we collect all results and display them all at the end? ❯ ./python.exe -m mimetypes 1.pdx 1.png
error: media type unknown for 1.pdx
type: image/png encoding: NoneSomething like this: diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index d38c6e1aba2..7d0f4c1fd40 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -718,8 +718,6 @@ def _parse_args(args):
def _main(args=None):
"""Run the mimetypes command-line interface and return a text to print."""
- import sys
-
args, help_text = _parse_args(args)
results = []
@@ -729,17 +727,21 @@ def _main(args=None):
if guess:
results.append(str(guess))
else:
- sys.exit(f"error: unknown type {gtype}")
- return '\n'.join(results)
+ results.append(f"error: unknown type {gtype}")
+ return results
else:
for gtype in args.type:
guess, encoding = guess_type(gtype, not args.lenient)
if guess:
results.append(f"type: {guess} encoding: {encoding}")
else:
- sys.exit(f"error: media type unknown for {gtype}")
- return '\n'.join(results)
+ results.append(f"error: media type unknown for {gtype}")
+ return results
if __name__ == '__main__':
- print(_main())
+ import sys
+
+ results = _main()
+ print("\n".join(results))
+ sys.exit(any(result.startswith("error: ") for result in results)) |
|
Very thanks! Applyed and fixed test |
Uh oh!
There was an error while loading. Please reload this page.