From bb1f7d929478942a07af20d9cce44418a9f9c7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= Date: Sun, 8 Sep 2019 09:56:27 -0400 Subject: [PATCH] Fix mimetypes.guess_type (#471) `mimetypes.guess_type` fails if the url is something like `http://example.com/file.zip?u=10`. Backported from 6bffb66 --- fbchat/_util.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fbchat/_util.py b/fbchat/_util.py index 58fa657..af06d42 100644 --- a/fbchat/_util.py +++ b/fbchat/_util.py @@ -219,11 +219,12 @@ def get_files_from_urls(file_urls): r = requests.get(file_url) # We could possibly use r.headers.get('Content-Disposition'), see # https://stackoverflow.com/a/37060758 + file_name = basename(file_url).split("?")[0].split("#")[0] files.append( ( - basename(file_url).split("?")[0].split("#")[0], + file_name, r.content, - r.headers.get("Content-Type") or guess_type(file_url)[0], + r.headers.get("Content-Type") or guess_type(file_name)[0], ) ) return files