From 3505c44dc52309a2672486937209e2d40054df63 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Fri, 13 Mar 2026 10:17:43 -0400 Subject: [PATCH 01/12] Add MIME types for TTC and Haptics formats Added new MIME types for font collections and haptics. --- Lib/mimetypes.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index a834826114614d..5639ba858ee2da 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -599,10 +599,14 @@ def _default_mime_types(): '.ra' : 'audio/x-pn-realaudio', '.wav' : 'audio/vnd.wave', '.weba' : 'audio/webm', + '.ttc' : 'font/collection', '.otf' : 'font/otf', '.ttf' : 'font/ttf', '.woff' : 'font/woff', '.woff2' : 'font/woff2', + '.ivs' : 'haptics/ivs', + '.hjif' : 'haptics/hjif', + '.hmpg' : 'haptics/hmpg', '.avif' : 'image/avif', '.bmp' : 'image/bmp', '.emf' : 'image/emf', From 500700dbf1fffea90caffa9846d73d7a636df950 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2026 14:23:35 +0000 Subject: [PATCH 02/12] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20b?= =?UTF-8?q?lurb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst diff --git a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst new file mode 100644 index 00000000000000..b35743598c5af9 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst @@ -0,0 +1,6 @@ +Add the following to ``mimetypes``: + +* ``font/collection`` +* ``haptics/ivs`` +* ``haptics/hjif`` +* ``haptics/hmpg`` From c68cbf698d4449a2674d37713991ac79c2c2ee93 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Fri, 13 Mar 2026 10:27:01 -0400 Subject: [PATCH 03/12] Mention in What's New --- Doc/whatsnew/3.15.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst index 7ea7c901eceb19..61368c7cd6a39f 100644 --- a/Doc/whatsnew/3.15.rst +++ b/Doc/whatsnew/3.15.rst @@ -929,6 +929,15 @@ mimetypes (Contributed by Charlie Lin in :gh:`145718`.) +* Add the following: + + - ``font/collection`` for ``.ttc`` extension + - ``haptics/ivs`` for ``.ivs` extension` + - ``haptics/hjif`` for ``.hjif`` extension + - ``haptics/hmpg`` for ``.hmpg`` extension + + (Contributed by Charlie Lin in :gh:`145918`.) + * Add ``image/jxl``. (Contributed by Foolbar in :gh:`144213`.) * Rename ``application/x-texinfo`` to ``application/texinfo``. (Contributed by Charlie Lin in :gh:`140165`.) From caf3abdcf96f26dfb2ac09606267321033cf92b7 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Fri, 13 Mar 2026 10:30:55 -0400 Subject: [PATCH 04/12] Fix typo in haptics/ivs extension description --- Doc/whatsnew/3.15.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst index 61368c7cd6a39f..5ebaa9103d7f4c 100644 --- a/Doc/whatsnew/3.15.rst +++ b/Doc/whatsnew/3.15.rst @@ -932,7 +932,7 @@ mimetypes * Add the following: - ``font/collection`` for ``.ttc`` extension - - ``haptics/ivs`` for ``.ivs` extension` + - ``haptics/ivs`` for ``.ivs`` extension - ``haptics/hjif`` for ``.hjif`` extension - ``haptics/hmpg`` for ``.hmpg`` extension From 18ee54dcb6b4cd41229716bef75d6c5ecbf12cd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 09:43:58 +0300 Subject: [PATCH 05/12] build(deps): bump qs from 6.14.0 to 6.15.0 in /Platforms/emscripten/browser_test (#146048) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From c6e8d6ab1f5d73f314d4eacc72866d2f813d1b15 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Wed, 1 Apr 2026 19:29:39 -0400 Subject: [PATCH 06/12] Update Lib/mimetypes.py Co-authored-by: Benedikt Johannes --- Lib/mimetypes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index 5639ba858ee2da..c94f4eb067b408 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -604,7 +604,6 @@ def _default_mime_types(): '.ttf' : 'font/ttf', '.woff' : 'font/woff', '.woff2' : 'font/woff2', - '.ivs' : 'haptics/ivs', '.hjif' : 'haptics/hjif', '.hmpg' : 'haptics/hmpg', '.avif' : 'image/avif', From eefa7d808a723c41f352b074de0bb7cd240031b3 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Wed, 1 Apr 2026 19:29:49 -0400 Subject: [PATCH 07/12] Update Lib/mimetypes.py Co-authored-by: Benedikt Johannes --- Lib/mimetypes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index c94f4eb067b408..ad18db09f6b340 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -606,6 +606,7 @@ def _default_mime_types(): '.woff2' : 'font/woff2', '.hjif' : 'haptics/hjif', '.hmpg' : 'haptics/hmpg', + '.ivs' : 'haptics/ivs', '.avif' : 'image/avif', '.bmp' : 'image/bmp', '.emf' : 'image/emf', From a693457c3f82a8feccf52b81d560de907d083d3d Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Wed, 1 Apr 2026 19:30:45 -0400 Subject: [PATCH 08/12] Update mimetypes with new entries Added new mimetypes for font and haptics. --- .../Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst index b35743598c5af9..06a57fe9e72ae2 100644 --- a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst +++ b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst @@ -3,4 +3,6 @@ Add the following to ``mimetypes``: * ``font/collection`` * ``haptics/ivs`` * ``haptics/hjif`` -* ``haptics/hmpg`` +* ``haptics/hmpg`` + +(Contributed by Charlie Lin in :gh:`145918`.) From 9fc6be5ae78433fb9e3beec60cf452eb5a499faf Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Wed, 1 Apr 2026 19:51:02 -0400 Subject: [PATCH 09/12] Format mimetypes list for consistency --- .../2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst index 06a57fe9e72ae2..d40c6bdec90fe9 100644 --- a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst +++ b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst @@ -1,8 +1,8 @@ Add the following to ``mimetypes``: -* ``font/collection`` -* ``haptics/ivs`` -* ``haptics/hjif`` -* ``haptics/hmpg`` + - ``font/collection`` + - ``haptics/ivs`` + - ``haptics/hjif`` + - ``haptics/hmpg`` (Contributed by Charlie Lin in :gh:`145918`.) From eacf10a57d64a514da6f81869ccc1cc9b5a4824d Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Fri, 10 Apr 2026 21:28:05 -0400 Subject: [PATCH 10/12] Spacing --- .../next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst index d40c6bdec90fe9..962f5859c75baf 100644 --- a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst +++ b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst @@ -5,4 +5,4 @@ Add the following to ``mimetypes``: - ``haptics/hjif`` - ``haptics/hmpg`` -(Contributed by Charlie Lin in :gh:`145918`.) + (Contributed by Charlie Lin in :gh:`145918`.) From 3def942c56a59117113dcbb35f9e464e3702f685 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Fri, 10 Apr 2026 21:36:13 -0400 Subject: [PATCH 11/12] Add asterisk --- .../next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst index 962f5859c75baf..3da8d9ad69c2ee 100644 --- a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst +++ b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst @@ -1,4 +1,4 @@ -Add the following to ``mimetypes``: +* Add the following to ``mimetypes``: - ``font/collection`` - ``haptics/ivs`` From d8158515359f39baf3b61b12e8eede28a323fbb1 Mon Sep 17 00:00:00 2001 From: Charlie Lin Date: Fri, 10 Apr 2026 21:57:42 -0400 Subject: [PATCH 12/12] Format mimetypes addition for clarity --- .../2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst index 3da8d9ad69c2ee..4dc9d29c3e6bde 100644 --- a/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst +++ b/Misc/NEWS.d/next/Library/2026-03-13-14-23-33.gh-issue-145917.TooGKx.rst @@ -1,8 +1,8 @@ -* Add the following to ``mimetypes``: +Add the following to ``mimetypes``: - - ``font/collection`` - - ``haptics/ivs`` - - ``haptics/hjif`` - - ``haptics/hmpg`` +``font/collection`` +``haptics/ivs`` +``haptics/hjif`` +``haptics/hmpg`` - (Contributed by Charlie Lin in :gh:`145918`.) +(Contributed by Charlie Lin in :gh:`145918`.)