https://github.com/python/cpython/commit/dc7a2b6522ec7af41282bc34f405bee9b306d611
commit: dc7a2b6522ec7af41282bc34f405bee9b306d611
branch: main
author: Hugo van Kemenade <[email protected]>
committer: hugovk <[email protected]>
date: 2024-11-21T16:55:28+02:00
summary:
gh-118761: Improve import time of `mimetypes` (#126979)
files:
A Misc/NEWS.d/next/Library/2024-11-18-22-02-47.gh-issue-118761.GQKD_J.rst
M Lib/mimetypes.py
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 61cba1ac4932d0..753238354f6d36 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -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:
@@ -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)
@@ -146,6 +145,10 @@ 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):
@@ -153,6 +156,9 @@ def guess_file_type(self, path, *, strict=True):
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)
@@ -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)
@@ -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.
@@ -646,6 +655,7 @@ def _default_mime_types():
def _main():
import getopt
+ import sys
USAGE = """\
Usage: mimetypes.py [options] type
diff --git
a/Misc/NEWS.d/next/Library/2024-11-18-22-02-47.gh-issue-118761.GQKD_J.rst
b/Misc/NEWS.d/next/Library/2024-11-18-22-02-47.gh-issue-118761.GQKD_J.rst
new file mode 100644
index 00000000000000..ebb9fe8016de21
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-18-22-02-47.gh-issue-118761.GQKD_J.rst
@@ -0,0 +1,2 @@
+Improve import time of :mod:`mimetypes` by around 11-16 times. Patch by Hugo
+van Kemenade.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]