From 5a638a805503131f4a9cc2bbc5944611295c1500 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sat, 12 Oct 2019 09:58:11 -0700 Subject: [3.8] bpo-38449: Revert "bpo-22347: Update mimetypes.guess_type to allow oper parsing of URLs" (GH-16724) (GH-16728) This reverts commit 87bd2071c756188b6cd577889fb1682831142ceb. The reason for revert is a regression caused by the change in 3.8.0rc1, see bpo-38449 for more details. https://bugs.python.org/issue38449 (cherry picked from commit 19a3d873005e5730eeabdc394c961e93f2ec02f0) Co-authored-by: Abhilash Raj --- Lib/mimetypes.py | 3 +-- Lib/test/test_mimetypes.py | 8 -------- Lib/test/test_urllib2.py | 2 +- Misc/NEWS.d/next/Library/2019-10-11-18-49-00.bpo-38449.9TWMlz.rst | 2 ++ 4 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2019-10-11-18-49-00.bpo-38449.9TWMlz.rst diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index 9fdd6eb..9b42bf6 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -114,8 +114,7 @@ class MimeTypes: but non-standard types. """ url = os.fspath(url) - p = urllib.parse.urlparse(url) - scheme, url = p.scheme, p.path + scheme, url = urllib.parse._splittype(url) if scheme == 'data': # syntax of data URLs: # dataurl := "data:" [ mediatype ] [ ";base64" ] "," data diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py index 7761c3f..bfd5eee 100644 --- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -51,14 +51,6 @@ class MimeTypesTestCase(unittest.TestCase): eq(self.db.guess_type('foo.xul', strict=False), ('text/xul', None)) eq(self.db.guess_extension('image/jpg', strict=False), '.jpg') - def test_url(self): - result = self.db.guess_type('http://host.html') - msg = 'URL only has a host name, not a file' - self.assertSequenceEqual(result, (None, None), msg) - result = self.db.guess_type('http://example.com/host.html') - msg = 'Should be text/html' - self.assertSequenceEqual(result, ('text/html', None), msg) - def test_guess_all_types(self): eq = self.assertEqual unless = self.assertTrue diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index e7e80bc..61e3ecc 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -744,7 +744,7 @@ class HandlerTests(unittest.TestCase): ["foo", "bar"], "", None), ("ftp://localhost/baz.gif;type=a", "localhost", ftplib.FTP_PORT, "", "", "A", - [], "baz.gif", "image/gif"), + [], "baz.gif", None), # XXX really this should guess image/gif ]: req = Request(url) req.timeout = None diff --git a/Misc/NEWS.d/next/Library/2019-10-11-18-49-00.bpo-38449.9TWMlz.rst b/Misc/NEWS.d/next/Library/2019-10-11-18-49-00.bpo-38449.9TWMlz.rst new file mode 100644 index 0000000..f7b1dbf --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-10-11-18-49-00.bpo-38449.9TWMlz.rst @@ -0,0 +1,2 @@ +Revert GH-15522, which introduces a regression in +:meth:`mimetypes.guess_type` due to improper handling of filenames as urls. -- cgit v0.12