commit 19a3d873005e5730eeabdc394c961e93f2ec02f0
author Abhilash Raj <maxking@users.noreply.github.com> Fri Oct 11 22:41:35 2019 -0700
committer Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Fri Oct 11 22:41:35 2019 -0700
tree 888187697cbe6cd398211a1ba309a313a934ffbe
parent 2b7dc40b2af6578181808ba73c1533fc114e55df

bpo-38449: Revert "bpo-22347: Update mimetypes.guess_type to allow oper parsing of URLs (GH-15522)" (GH-16724)



This reverts commit 87bd2071c756188b6cd577889fb1682831142ceb.



https://bugs.python.org/issue38449

Lib/test/test_mimetypes.py

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 @@
         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

Lib/test/test_urllib2.py

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 186a967..8abedaa 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -742,7 +742,7 @@
              ["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