Skip to content

gh-136507: Fix mimetypes CLI to handle multiple file parameters #136508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 7 commits into from
Aug 25, 2025
Merged

gh-136507: Fix mimetypes CLI to handle multiple file parameters #136508

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69ae20c
Fix mimetypes CLI cannot handle multiple file parameters
Wulian233 Jul 10, 2025
639644b
fix test
Wulian233 Jul 10, 2025
ebf9b25
finish
Wulian233 Jul 11, 2025
9500cb3
test_multiple_inputs
Wulian233 Jul 17, 2025
272c7e8
Update Misc/NEWS.d/next/Library/2025-07-10-21-02-43.gh-issue-136507.p…
Wulian233 Jul 22, 2025
d68cc17
test the failure case
Wulian233 Jul 23, 2025
9e23811
collect all results and display them all at the end
Wulian233 Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Lib/mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,18 +722,23 @@ def _main(args=None):

args, help_text = _parse_args(args)

results = []
if args.extension:
for gtype in args.type:
guess = guess_extension(gtype, not args.lenient)
if guess:
return str(guess)
sys.exit(f"error: unknown type {gtype}")
results.append(str(guess))
else:
sys.exit(f"error: unknown type {gtype}")
return '\n'.join(results)
else:
for gtype in args.type:
guess, encoding = guess_type(gtype, not args.lenient)
if guess:
return f"type: {guess} encoding: {encoding}"
sys.exit(f"error: media type unknown for {gtype}")
results.append(f"type: {guess} encoding: {encoding}")
else:
sys.exit(f"error: media type unknown for {gtype}")
return '\n'.join(results)
return help_text
Copy link
Copy Markdown
Contributor

@mpkocher mpkocher Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is return help_text line used?

Either:

  • delete return help_text (that branch of the code is never used)
  • change return help_text to return "\n".join(results) and delete the other return calls at the end of each for type in args.type block.

Copy link
Copy Markdown
Contributor Author

@Wulian233 Wulian233 Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not used, IDE already given a hint

In addition, test failure case have been added



Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,14 @@ def test_parse_args(self):
self.assertFalse(args.lenient)
self.assertEqual(args.type, ["foo.pic"])

def test_multiple_inputs(self):
result = mimetypes._main(shlex.split("foo.pdf foo.png"))
self.assertEqual(
result,
"type: application/pdf encoding: None\n"
"type: image/png encoding: None"
)

def test_invocation(self):
for command, expected in [
("-l -e image/jpg", ".jpg"),
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2025-07-10-21-02-43.gh-issue-136507.pnEuGS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix mimetypes CLI to handle multiple file parameters.
Loading