Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

gh-93096: fix test_mimetypes.test_guess_type_conflicting_with_mimetypes #131408

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.

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
merged 11 commits into from
Apr 8, 2025
Merged
27 changes: 16 additions & 11 deletions 27 Lib/mimetypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -669,9 +669,7 @@ def _default_mime_types():
_default_mime_types()


def _main():
"""Run the mimetypes command-line interface."""
import sys
def _parse_args(args):
from argparse import ArgumentParser

parser = ArgumentParser(description='map filename extensions to MIME types')
Expand All @@ -686,23 +684,30 @@ def _main():
help='additionally search for common but non-standard types'
)
parser.add_argument('type', nargs='+', help='a type to search')
args = parser.parse_args()
args = parser.parse_args(args)
return args, parser.format_help()


def _main(args=None):
"""Run the mimetypes command-line interface and return a text to print."""
import sys

args, help_text = _parse_args(args)

if args.extension:
for gtype in args.type:
guess = guess_extension(gtype, not args.lenient)
if guess:
print(guess)
else:
sys.exit(f"error: unknown type {gtype}")
return str(guess)
sys.exit(f"error: unknown type {gtype}")
else:
for gtype in args.type:
guess, encoding = guess_type(gtype, not args.lenient)
if guess:
print('type:', guess, 'encoding:', encoding)
else:
sys.exit(f"error: media type unknown for {gtype}")
return f"type: {guess} encoding: {encoding}"
sys.exit(f"error: media type unknown for {gtype}")
return parser.format_help()


if __name__ == '__main__':
_main()
print(_main())
100 changes: 48 additions & 52 deletions 100 Lib/test/test_mimetypes.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import io
import mimetypes
import os
import shlex
import sys
import unittest.mock
from os import linesep

from platform import win32_edition
from test import support
from test.support import os_helper
from test.support.script_helper import run_python_until_end
from platform import win32_edition

try:
import _winapi
Expand Down Expand Up @@ -390,55 +389,52 @@ def test__all__(self):
support.check__all__(self, mimetypes)


class MimetypesCliTestCase(unittest.TestCase):

def mimetypes_cmd(cls, *args, **kwargs):
result, _ = run_python_until_end('-m', 'mimetypes', *args)
return result.rc, result.out.decode(), result.err.decode()

def test_help_option(self):
retcode, out, err = self.mimetypes_cmd('-h')
self.assertEqual(retcode, 0)
self.assertStartsWith(out, 'usage: ')
self.assertEqual(err, '')

def test_invalid_option(self):
retcode, out, err = self.mimetypes_cmd('--invalid')
self.assertEqual(retcode, 2)
self.assertEqual(out, '')
self.assertStartsWith(err, 'usage: ')

def test_guess_extension(self):
retcode, out, err = self.mimetypes_cmd('-l', '-e', 'image/jpg')
self.assertEqual(retcode, 0)
self.assertEqual(out, f'.jpg{linesep}')
self.assertEqual(err, '')

retcode, out, err = self.mimetypes_cmd('-e', 'image/jpg')
self.assertEqual(retcode, 1)
self.assertEqual(out, '')
self.assertEqual(err, f'error: unknown type image/jpg{linesep}')

retcode, out, err = self.mimetypes_cmd('-e', 'image/jpeg')
self.assertEqual(retcode, 0)
self.assertEqual(out, f'.jpg{linesep}')
self.assertEqual(err, '')

def test_guess_type(self):
retcode, out, err = self.mimetypes_cmd('-l', 'foo.webp')
self.assertEqual(retcode, 0)
self.assertEqual(out, f'type: image/webp encoding: None{linesep}')
self.assertEqual(err, '')

@unittest.skipIf(
sys.platform == 'darwin',
'macOS lists common_types in mime.types thus making them always known'
)
def test_guess_type_conflicting_with_mimetypes(self):
retcode, out, err = self.mimetypes_cmd('foo.pic')
self.assertEqual(retcode, 1)
self.assertEqual(out, '')
self.assertEqual(err, f'error: media type unknown for foo.pic{linesep}')
class CommandLineTest(unittest.TestCase):
def test_parse_args(self):
args, help_text = mimetypes._parse_args("-h")
self.assertTrue(help_text.startswith("usage: "))

args, help_text = mimetypes._parse_args("--invalid")
self.assertTrue(help_text.startswith("usage: "))

args, _ = mimetypes._parse_args(shlex.split("-l -e image/jpg"))
self.assertTrue(args.extension)
self.assertTrue(args.lenient)
self.assertEqual(args.type, ["image/jpg"])

args, _ = mimetypes._parse_args(shlex.split("-e image/jpg"))
self.assertTrue(args.extension)
self.assertFalse(args.lenient)
self.assertEqual(args.type, ["image/jpg"])

args, _ = mimetypes._parse_args(shlex.split("-l foo.webp"))
self.assertFalse(args.extension)
self.assertTrue(args.lenient)
self.assertEqual(args.type, ["foo.webp"])

args, _ = mimetypes._parse_args(shlex.split("foo.pic"))
self.assertFalse(args.extension)
self.assertFalse(args.lenient)
self.assertEqual(args.type, ["foo.pic"])


def test_invocation(self):
for command, expected in [
("-l -e image/jpg", ".jpg"),
("-e image/jpeg", ".jpg"),
("-l foo.webp", "type: image/webp encoding: None"),
]:
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"),
]:
with self.assertRaisesRegex(SystemExit, expected):
mimetypes._main(shlex.split(command))


if __name__ == "__main__":
unittest.main()
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.