Skip to content

gh-93417: Add use_system_defaults option for mimetypes #150733

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

Draft
serhiy-storchaka wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

gh-93417: Add use_system_defaults option for mimetypes #150733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions Lib/mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class MimeTypes:
URL, and can guess a reasonable extension given a MIME type.
"""

def __init__(self, filenames=(), strict=True):
def __init__(self, filenames=(), strict=True, *, use_system_defaults=False):
if not inited:
init()
self.encodings_map = _encodings_map_default.copy()
Expand All @@ -75,6 +75,14 @@ def __init__(self, filenames=(), strict=True):
self.add_type(type, ext, True)
for (ext, type) in _common_types_default.items():
self.add_type(type, ext, False)
if use_system_defaults:
# Quick return if not supported
self.read_windows_registry(strict)
for name in knownfiles:
try:
self.read(name, strict)
except OSError:
pass
for name in filenames:
self.read(name, strict)

Expand Down Expand Up @@ -395,20 +403,15 @@ def add_type(type, ext, strict=True):
return _db.add_type(type, ext, strict)


def init(files=None):
def init(files=None, *, use_system_defaults=True):
global suffix_map, types_map, encodings_map, common_types
global inited, _db
inited = True # so that MimeTypes.__init__() doesn't call us again

if files is None or _db is None:
db = MimeTypes()
# Quick return if not supported
db.read_windows_registry()

db = MimeTypes(use_system_defaults=use_system_defaults)
if files is None:
files = knownfiles
else:
files = knownfiles + list(files)
files = ()
else:
db = _db

Expand Down
7 changes: 7 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 @@ -230,6 +230,9 @@ def test_init_knownfiles(self):
mimetypes.init()
self.assertEqual(guess_file_type("file.test2")[0], "testing/test2")

mimetypes.init(use_system_defaults=False)
self.assertEqual(guess_file_type("file.test2")[0], None)

def test_added_types_are_used(self):
mimetypes.add_type('testing/default-type', '')
mime_type, _ = mimetypes.guess_type('')
Expand Down Expand Up @@ -272,6 +275,10 @@ def test_init_knownfiles(self):
guess_file_type = db.guess_file_type
self.assertEqual(guess_file_type("file.test2")[0], None)

db = mimetypes.MimeTypes(use_system_defaults=True)
guess_file_type = db.guess_file_type
self.assertEqual(guess_file_type("file.test2")[0], "testing/test2")

def test_case_sensitivity(self):
eq = self.assertEqual
eq(self.db.guess_file_type("foobar.html"), ("text/html", None))
Expand Down
Loading