]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-20392: Fix inconsistency with uppercase file extensions in mimetypes.guess_type...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 15 Mar 2022 15:50:01 +0000 (08:50 -0700)
committerGitHub <noreply@github.com>
Tue, 15 Mar 2022 15:50:01 +0000 (08:50 -0700)
(cherry picked from commit 5dd7ec52b83e7f239774cf7478106fcc7b0a36f3)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
Lib/mimetypes.py
Lib/test/test_mimetypes.py
Misc/NEWS.d/next/Library/2021-12-22-12-02-27.bpo-20392.CLAFIp.rst [new file with mode: 0644]

index d36e1664cdcc8267b93a834a9e3b9b81456adf19..58ace01b41ab1de0f92c0a34ea43ed19b0993e8d 100644 (file)
@@ -135,25 +135,23 @@ class MimeTypes:
                 type = 'text/plain'
             return type, None           # never compressed, so encoding is None
         base, ext = posixpath.splitext(url)
-        while ext in self.suffix_map:
-            base, ext = posixpath.splitext(base + self.suffix_map[ext])
+        while (ext_lower := ext.lower()) in self.suffix_map:
+            base, ext = posixpath.splitext(base + self.suffix_map[ext_lower])
+        # encodings_map is case sensitive
         if ext in self.encodings_map:
             encoding = self.encodings_map[ext]
             base, ext = posixpath.splitext(base)
         else:
             encoding = None
+        ext = ext.lower()
         types_map = self.types_map[True]
         if ext in types_map:
             return types_map[ext], encoding
-        elif ext.lower() in types_map:
-            return types_map[ext.lower()], encoding
         elif strict:
             return None, encoding
         types_map = self.types_map[False]
         if ext in types_map:
             return types_map[ext], encoding
-        elif ext.lower() in types_map:
-            return types_map[ext.lower()], encoding
         else:
             return None, encoding
 
index 5d0615e99b4e4a32bd866f199da41b70a87b3cac..254b8f8a4aeb7a40a19b79e0c33f3b3822ab0f5b 100644 (file)
@@ -27,6 +27,13 @@ def tearDownModule():
 class MimeTypesTestCase(unittest.TestCase):
     def setUp(self):
         self.db = mimetypes.MimeTypes()
+        
+    def test_case_sensitivity(self):
+        eq = self.assertEqual
+        eq(self.db.guess_type("foobar.HTML"), self.db.guess_type("foobar.html"))
+        eq(self.db.guess_type("foobar.TGZ"), self.db.guess_type("foobar.tgz"))
+        eq(self.db.guess_type("foobar.tar.Z"), ("application/x-tar", "compress"))
+        eq(self.db.guess_type("foobar.tar.z"), (None, None))
 
     def test_default_data(self):
         eq = self.assertEqual
diff --git a/Misc/NEWS.d/next/Library/2021-12-22-12-02-27.bpo-20392.CLAFIp.rst b/Misc/NEWS.d/next/Library/2021-12-22-12-02-27.bpo-20392.CLAFIp.rst
new file mode 100644 (file)
index 0000000..8973c4d
--- /dev/null
@@ -0,0 +1 @@
+Fix inconsistency with uppercase file extensions in :meth:`MimeTypes.guess_type`. Patch by Kumar Aditya.\r