From 5975e3bee7f37b006df82efdb4811b50460d7c55 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 17 Jan 2021 16:43:43 +0100 Subject: rfc6266: Better error handling UnicodeDecodeError should never happen with iso-8859-1, and the exceptions tested in the test are from the old code. --- qutebrowser/browser/webkit/http.py | 6 +----- tests/unit/browser/webkit/http/test_http.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py index b96614d0a..cc8b21aa8 100644 --- a/qutebrowser/browser/webkit/http.py +++ b/qutebrowser/browser/webkit/http.py @@ -83,13 +83,9 @@ class ContentDisposition: # value won't get dismissed because of an unrelated ambiguity in the # filename parameter. But it does mean we occasionally give # less-than-certain values for some legacy senders. - try: - decoded = value.decode('iso-8859-1') - except UnicodeDecodeError as e: - raise ContentDispositionError(e) + decoded = value.decode('iso-8859-1') reg = email.headerregistry.HeaderRegistry() - try: parsed = reg('Content-Disposition', decoded) except IndexError: diff --git a/tests/unit/browser/webkit/http/test_http.py b/tests/unit/browser/webkit/http/test_http.py index ce1ae9419..4192e29e2 100644 --- a/tests/unit/browser/webkit/http/test_http.py +++ b/tests/unit/browser/webkit/http/test_http.py @@ -67,7 +67,7 @@ def test_content_disposition_directly_hypothesis(s): try: cd = http.ContentDisposition.parse(s) cd.filename() - except (SyntaxError, UnicodeDecodeError, http.ContentDispositionError): + except http.ContentDispositionError: pass -- cgit v1.2.3-54-g00ecf