10000 gh-93096: fix `test_mimetypes.test_guess_type_conflicting_with_mimetypes` by picnixz · Pull Request #131408 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

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.

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
merged 11 commits into from
Apr 8, 2025
Merged

gh-93096: fix test_mimetypes.test_guess_type_conflicting_with_mimetypes #131408

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62863a0
fix `test_mimetypes.test_guess_type_conflicting_with_mimetypes`
picnixz Mar 18, 2025
7be23f0
remove checks for linesep
picnixz Mar 18, 2025
01e89c3
use `parser.exit()` instead of print + sys.exit()
picnixz Mar 26, 2025
60f9eeb
Merge remote-tracking branch 'upstream/main' into fix/test/conflictin…
picnixz Mar 28, 2025
1d29b5d
fixup
picnixz Mar 28, 2025
eeb5635
Update Lib/test/test_mimetypes.py
picnixz Mar 30, 2025
d9d136e
use Hugo's approach for testing `mimetypes`
picnixz Apr 8, 2025
8ba9b1d
Merge branch 'main' into fix/test/conflicting-mime-types-93096
picnixz Apr 8, 2025
b0c29fa
Update Lib/test/test_mimetypes.py
picnixz Apr 8, 2025
56bbd95
[empty commit to trigger CI]
picnixz Apr 8, 2025
1efb979
Merge branch 'fix/test/conflicting-mime-types-93096' of github.com:pi…
picnixz Apr 8, 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
Prev Previous commit
Next Next commit
use Hugo's approach for testing mimetypes
  • Loading branch information
@picnixz
picnixz committed Apr 8, 2025
commit d9d136e091a329e20033499312b28b08f82eef59
27 changes: 15 additions & 12 deletions Lib/mimetypes.py
View file
Open in desktop
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(args=None):
"""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 @@ -687,24 +685,29 @@ def _main(args=None):
)
parser.add_argument('type', nargs='+', help='a type to search')
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:
# do not use parser.error() as it prints a help message
parser.exit(1, f"error: unknown type {gtype}\n")
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:
# do not use parser.error() as it prints a help message
parser.exit(1, f"error: media type unknown for {gtype}\n")
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())
101 changes: 46 additions & 55 deletions Lib/test/test_mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import io
import mimetypes
import os
import shlex
import sys
import unittest.mock
from platform import win32_edition
Expand Down Expand Up @@ -389,61 +390,51 @@ def test__all__(self):
support.check__all__(self, mimetypes)


class MimetypesCliTestCase(unittest.TestCase):

def mimetypes_cmd(self, *args):
# We cannot use run_python_until_end() as the latter would not
# call setUpModule() which unsets mimetypes.knowfiles. Instead,
# we need to directly call the main() function in order to avoid
# re-initializing the database.
rc, out, err = 0, io.StringIO(), io.StringIO()
with contextlib.redirect_stdout(out), contextlib.redirect_stderr(err):
try:
mimetypes._main(args)
except SystemExit as exc:
self.assertIsInstance(exc.code, int)
rc = exc.code
return rc, out.getvalue(), err.getvalue()

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, '.jpg\n')
self.assertEqual(err, '')

retcode, out, err = self.mimetypes_cmd('-e', 'image/jpg')
self.assertEqual(retcode, 1)
self.assertEqual(out, '')
self.assertEqual(err, 'error: unknown type image/jpg\n')

retcode, out, err = self.mimetypes_cmd('-e', 'image/jpeg')
self.assertEqual(retcode, 0)
self.assertEqual(out, '.jpg\n')
self.assertEqual(err, '')

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

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, 'error: media type unknown for foo.pic\n')
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__":
Expand Down
Loading
0