mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 18:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-20392: Fix inconsistency with uppercase file extensions in mimetypes.guess_type (GH-30229)

Browse source 
(cherry picked from commit 5dd7ec52b8)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2022-03-15 08:50:01 -07:00 • committed by GitHub
parent 64a68c39cb
commit 32ae9ab55f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/mimetypes.py
View file

@ -135,25 +135,23 @@ class MimeTypes:
type = 'text/plain' type = 'text/plain'
return type, None # never compressed, so encoding is None return type, None # never compressed, so encoding is None
base, ext = posixpath.splitext(url) base, ext = posixpath.splitext(url)
while ext in self.suffix_map: while (ext_lower := ext.lower()) in self.suffix_map:
base, ext = posixpath.splitext(base + self.suffix_map[ext]) base, ext = posixpath.splitext(base + self.suffix_map[ext_lower])
# encodings_map is case sensitive
if ext in self.encodings_map: if ext in self.encodings_map:
encoding = self.encodings_map[ext] encoding = self.encodings_map[ext]
base, ext = posixpath.splitext(base) base, ext = posixpath.splitext(base)
else: else:
encoding = None encoding = None
ext = ext.lower()
types_map = self.types_map[True] types_map = self.types_map[True]
if ext in types_map: if ext in types_map:
return types_map[ext], encoding return types_map[ext], encoding
elif ext.lower() in types_map:
return types_map[ext.lower()], encoding
elif strict: elif strict:
return None, encoding return None, encoding
types_map = self.types_map[False] types_map = self.types_map[False]
if ext in types_map: if ext in types_map:
return types_map[ext], encoding return types_map[ext], encoding
elif ext.lower() in types_map:
return types_map[ext.lower()], encoding
else: else:
return None, encoding return None, encoding

7
Lib/test/test_mimetypes.py
View file

@ -27,6 +27,13 @@ def tearDownModule():
class MimeTypesTestCase(unittest.TestCase): class MimeTypesTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.db = mimetypes.MimeTypes() 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): def test_default_data(self):
eq = self.assertEqual eq = self.assertEqual

1
Misc/NEWS.d/next/Library/2021-12-22-12-02-27.bpo-20392.CLAFIp.rst Normal file
View file

@ -0,0 +1 @@
Fix inconsistency with uppercase file extensions in :meth:`MimeTypes.guess_type`. Patch by Kumar Aditya.