Skip to content

gh-84852: Add MIME types for .eot, ,otf, .ttf, .woff and .woff2 fonts #20199

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 10 commits into from
Nov 12, 2024
Merged

gh-84852: Add MIME types for .eot, ,otf, .ttf, .woff and .woff2 fonts #20199

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ce88d1
Add fonts .woff, .woff2, .eot and .ttf to mimetypes
sahil290791 May 19, 2020
621f88e
📜🤖 Added by blurb_it.
blurb-it[bot] May 19, 2020
1a0e8ed
Sort .woff, .woff2, .eot, .ttf and .otf alphabetically
sahil290791 May 19, 2020
578bea4
Merge branch 'main' into master
hugovk Nov 4, 2024
78dcd11
Add newline to fix lint, use gh issue number instead of bpo
hugovk Nov 4, 2024
fc668fd
Remove duplicates added in merge conflict resolution
hugovk Nov 4, 2024
b08efee
Rename font MIME types to follow RFC 8081
hugovk Nov 4, 2024
d4cdfdc
Update MS Embedded OpenType MIME type
hugovk Nov 4, 2024
2ea2041
Merge remote-tracking branch 'upstream/main'
hugovk Nov 11, 2024
77a094a
Re-add newline
hugovk Nov 11, 2024
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
13 changes: 13 additions & 0 deletions Doc/whatsnew/3.14.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,19 @@ json
(Contributed by Trey Hunner in :gh:`122873`.)


mimetypes
---------

* Add MS and :rfc:`8081` MIME types for fonts:

* Embedded OpenType: ``application/vnd.ms-fontobject``
* OpenType Layout (OTF) ``font/otf``
* TrueType: ``font/ttf``
* WOFF 1.0 ``font/woff``
* WOFF 2.0 ``font/woff2``

(Contributed by Sahil Prajapati and Hugo van Kemenade in :gh:`84852`.)

operator
--------

Expand Down
5 changes: 5 additions & 0 deletions Lib/mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ def _default_mime_types():
'.m3u8' : 'application/vnd.apple.mpegurl',
'.xls' : 'application/vnd.ms-excel',
'.xlb' : 'application/vnd.ms-excel',
'.eot' : 'application/vnd.ms-fontobject',
'.ppt' : 'application/vnd.ms-powerpoint',
'.pot' : 'application/vnd.ms-powerpoint',
'.ppa' : 'application/vnd.ms-powerpoint',
Expand Down Expand Up @@ -542,6 +543,10 @@ def _default_mime_types():
'.aiff' : 'audio/x-aiff',
'.ra' : 'audio/x-pn-realaudio',
'.wav' : 'audio/x-wav',
'.otf' : 'font/otf',
'.ttf' : 'font/ttf',
'.woff' : 'font/woff',
'.woff2' : 'font/woff2',
Comment on lines +547 to +550
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verified from the RFC that these 4 lines and hence the corresponding test lines are correct. There is no reference I see for the vnd-ms addition so cannot verify. The merge conflict will be in the tests due to the switch to using subtests, which looks good to me. So merge that first and fix this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for verifying.

application/vnd.ms-fontobject is vendor specific and can be seen for example at:

'.avif' : 'image/avif',
'.bmp' : 'image/bmp',
'.gif' : 'image/gif',
Expand Down
5 changes: 5 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 @@ -227,11 +227,16 @@ def check_extensions():
self.assertEqual(mimetypes.guess_extension('application/postscript'), '.ps')
self.assertEqual(mimetypes.guess_extension('application/vnd.apple.mpegurl'), '.m3u')
self.assertEqual(mimetypes.guess_extension('application/vnd.ms-excel'), '.xls')
self.assertEqual(mimetypes.guess_extension('application/vnd.ms-fontobject'), '.eot')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this is going to conflict with the refactoring in #126412.

self.assertEqual(mimetypes.guess_extension('application/vnd.ms-powerpoint'), '.ppt')
self.assertEqual(mimetypes.guess_extension('application/x-texinfo'), '.texi')
self.assertEqual(mimetypes.guess_extension('application/x-troff'), '.roff')
self.assertEqual(mimetypes.guess_extension('application/xml'), '.xsl')
self.assertEqual(mimetypes.guess_extension('audio/mpeg'), '.mp3')
self.assertEqual(mimetypes.guess_extension('font/otf'), '.otf')
self.assertEqual(mimetypes.guess_extension('font/ttf'), '.ttf')
self.assertEqual(mimetypes.guess_extension('font/woff'), '.woff')
self.assertEqual(mimetypes.guess_extension('font/woff2'), '.woff2')
self.assertEqual(mimetypes.guess_extension('image/avif'), '.avif')
self.assertEqual(mimetypes.guess_extension('image/webp'), '.webp')
self.assertEqual(mimetypes.guess_extension('image/jpeg'), '.jpg')
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-05-19-01-12-47.gh-issue-84852.FEjHJW.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add MIME types for MS Embedded OpenType, OpenType Layout, TrueType,
WOFF 1.0 and 2.0 fonts. Patch by Sahil Prajapati and Hugo van Kemenade.
Loading