From: Саша Черных <Kristinita@users.noreply.github.com>
Date: Mon, 21 Apr 2025 09:05:37 +0000 (+0300)
Subject: gh-132054: Add ``application/yaml`` to ``mimetypes`` (#132056)
X-Git-Tag: v3.14.0b1~384
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=132b6bc98f47a4d897dead8635b5a50a0baee485;p=thirdparty%2FPython%2Fcpython.git

gh-132054: Add ``application/yaml`` to ``mimetypes`` (#132056)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---

diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
index f02ce6bc1d4f..51f4286efd67 100644
--- a/Doc/whatsnew/3.14.rst
+++ b/Doc/whatsnew/3.14.rst
@@ -910,6 +910,10 @@ mimetypes
 
   (Contributed by Hugo van Kemenade in :gh:`129965`.)
 
+* Add :rfc:`9512` ``application/yaml`` MIME type for YAML files (``.yaml``
+  and ``.yml``). (Contributed by Sasha "Nelie" Chernykh and Hugo van Kemenade
+  in :gh:`132056`.)
+
 
 multiprocessing
 ---------------
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 7c3e9c0d1159..de842eabea80 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -544,6 +544,8 @@ def _default_mime_types():
         '.rdf'    : 'application/xml',
         '.wsdl'   : 'application/xml',
         '.xpdl'   : 'application/xml',
+        '.yaml'   : 'application/yaml',
+        '.yml'    : 'application/yaml',
         '.zip'    : 'application/zip',
         '.3gp'    : 'audio/3gpp',
         '.3gpp'   : 'audio/3gpp',
diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py
index 261017f832a2..f2a19c086357 100644
--- a/Lib/test/test_mimetypes.py
+++ b/Lib/test/test_mimetypes.py
@@ -243,6 +243,7 @@ class MimeTypesTestCase(unittest.TestCase):
                 ("application/x-texinfo", ".texi"),
                 ("application/x-troff", ".roff"),
                 ("application/xml", ".xsl"),
+                ("application/yaml", ".yaml"),
                 ("audio/flac", ".flac"),
                 ("audio/matroska", ".mka"),
                 ("audio/mp4", ".m4a"),
@@ -285,6 +286,26 @@ class MimeTypesTestCase(unittest.TestCase):
         mimetypes.init()
         check_extensions()
 
+    def test_guess_file_type(self):
+        def check_file_type():
+            for mime_type, ext in (
+                ("application/yaml", ".yaml"),
+                ("application/yaml", ".yml"),
+                ("audio/mpeg", ".mp2"),
+                ("audio/mpeg", ".mp3"),
+                ("video/mpeg", ".m1v"),
+                ("video/mpeg", ".mpe"),
+                ("video/mpeg", ".mpeg"),
+                ("video/mpeg", ".mpg"),
+            ):
+                with self.subTest(mime_type=mime_type, ext=ext):
+                    result, _ = mimetypes.guess_file_type(f"filename{ext}")
+                    self.assertEqual(result, mime_type)
+
+        check_file_type()
+        mimetypes.init()
+        check_file_type()
+
     def test_init_stability(self):
         mimetypes.init()
 
diff --git a/Misc/NEWS.d/next/Library/2025-04-03-20-28-54.gh-issue-132054.c1nlOx.rst b/Misc/NEWS.d/next/Library/2025-04-03-20-28-54.gh-issue-132054.c1nlOx.rst
new file mode 100644
index 000000000000..b9602c0b2ca1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-04-03-20-28-54.gh-issue-132054.c1nlOx.rst
@@ -0,0 +1,2 @@
+The ``application/yaml`` mime type (:rfc:`9512`) is now supported
+by :mod:`mimetypes`. Patch by Sasha "Nelie" Chernykh and Hugo van Kemenade.