Skip to content

Commit

Permalink
pythongh-118761: Improve import time of mimetypes (python#126979)
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored and ebonnal committed Jan 10, 2025
1 parent d2ef254 commit 883457a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
22 changes: 16 additions & 6 deletions Lib/mimetypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
read_mime_types(file) -- parse one file, return a dictionary or None
"""

import os
import sys
import posixpath
import urllib.parse

try:
from _winapi import _mimetypes_read_windows_registry
except ImportError:
Expand Down Expand Up @@ -119,6 +114,10 @@ def guess_type(self, url, strict=True):
Optional 'strict' argument when False adds a bunch of commonly found,
but non-standard types.
"""
# Lazy import to improve module import time
import os
import urllib.parse

# TODO: Deprecate accepting file paths (in particular path-like objects).
url = os.fspath(url)
p = urllib.parse.urlparse(url)
Expand Down Expand Up @@ -146,13 +145,20 @@ def guess_type(self, url, strict=True):
if '=' in type or '/' not in type:
type = 'text/plain'
return type, None # never compressed, so encoding is None

# Lazy import to improve module import time
import posixpath

return self._guess_file_type(url, strict, posixpath.splitext)

def guess_file_type(self, path, *, strict=True):
"""Guess the type of a file based on its path.
Similar to guess_type(), but takes file path instead of URL.
"""
# Lazy import to improve module import time
import os

path = os.fsdecode(path)
path = os.path.splitdrive(path)[1]
return self._guess_file_type(path, strict, os.path.splitext)
Expand Down Expand Up @@ -399,6 +405,9 @@ def init(files=None):
else:
db = _db

# Lazy import to improve module import time
import os

for file in files:
if os.path.isfile(file):
db.read(file)
Expand Down Expand Up @@ -445,7 +454,7 @@ def _default_mime_types():
}

# Before adding new types, make sure they are either registered with IANA,
# at http://www.iana.org/assignments/media-types
# at https://www.iana.org/assignments/media-types/media-types.xhtml
# or extensions, i.e. using the x- prefix

# If you add to these, please keep them sorted by mime type.
Expand Down Expand Up @@ -646,6 +655,7 @@ def _default_mime_types():

def _main():
import getopt
import sys

USAGE = """\
Usage: mimetypes.py [options] type
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Improve import time of :mod:`mimetypes` by around 11-16 times. Patch by Hugo
van Kemenade.

0 comments on commit 883457a

Please sign in to comment.