Skip to content

Commit

Permalink
bpo-20392: Fix inconsistency with uppercase file extensions in mimety…
Browse files Browse the repository at this point in the history
…pes.guess_type (GH-30229)

(cherry picked from commit 5dd7ec5)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
  • Loading branch information
miss-islington and kumaraditya303 committed Mar 15, 2022
1 parent 64a68c3 commit 32ae9ab
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
10 changes: 4 additions & 6 deletions Lib/mimetypes.py
Expand Up @@ -135,25 +135,23 @@ def guess_type(self, url, strict=True):
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

Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_mimetypes.py
Expand Up @@ -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
Expand Down
@@ -0,0 +1 @@
Fix inconsistency with uppercase file extensions in :meth:`MimeTypes.guess_type`. Patch by Kumar Aditya.

0 comments on commit 32ae9ab

Please sign in to comment.