Skip to content

[3.8] bpo-38449: Revert "bpo-22347: Update mimetypes.guess_type to allow oper parsing of URLs (GH-15685)" (GH-16724) #16728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxking merged 1 commit into from
Oct 12, 2019
Merged

[3.8] bpo-38449: Revert "bpo-22347: Update mimetypes.guess_type to allow oper parsing of URLs (GH-15685)" (GH-16724) #16728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[3.8] bpo-38449: Revert "bpo-22347: Update mimetypes.guess_type to al… 
…low oper parsing of URLs (GH-15522)" (GH-16724)

This reverts commit 87bd207.

https://bugs.python.org/issue38449
(cherry picked from commit 19a3d87)

Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
  • Loading branch information
@maxking
maxking committed Oct 12, 2019
commit b4a84d0e871ee93be1119fbd15e93712a0383b37
3 changes: 1 addition & 2 deletions Lib/mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ def guess_type(self, url, strict=True):
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
Expand Down
8 changes: 0 additions & 8 deletions Lib/test/test_mimetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@ def test_non_standard_types(self):
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
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_urllib2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ def connect_ftp(self, user, passwd, host, port, dirs,
["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
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-10-11-18-49-00.bpo-38449.9TWMlz.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Revert GH-15522, which introduces a regression in
:meth:`mimetypes.guess_type` due to improper handling of filenames as urls.