From cdd7457aee53a85f5e2379d163272013bc457b1b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 12 Aug 2014 21:12:13 +0200 Subject: [PATCH] utils.http: Return [None, None] in parse_content_type. --- qutebrowser/test/utils/http/test_http.py | 6 +++--- qutebrowser/utils/http.py | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/qutebrowser/test/utils/http/test_http.py b/qutebrowser/test/utils/http/test_http.py index ebfe3ad9e..7ee660905 100644 --- a/qutebrowser/test/utils/http/test_http.py +++ b/qutebrowser/test/utils/http/test_http.py @@ -33,12 +33,12 @@ class ParseContentTypeTests(unittest.TestCase): """Test for parse_content_type.""" - # pylint: disable=unpacking-non-sequence - def test_not_existing(self): """Test without any Content-Type header.""" reply = FakeNetworkReply() - self.assertIsNone(httputils.parse_content_type(reply)) + mimetype, rest = httputils.parse_content_type(reply) + self.assertIsNone(mimetype) + self.assertIsNone(rest) def test_mimetype(self): """Test with simple Content-Type header.""" diff --git a/qutebrowser/utils/http.py b/qutebrowser/utils/http.py index 5fdb16db3..d7d2f17f9 100644 --- a/qutebrowser/utils/http.py +++ b/qutebrowser/utils/http.py @@ -72,12 +72,12 @@ def parse_content_type(reply): reply: The QNetworkReply to handle. Return: - A [mimetype, rest] list, or None. + A [mimetype, rest] list, or [None, None] if unset. Rest can be None. """ content_type = reply.header(QNetworkRequest.ContentTypeHeader) if content_type is None: - return None + return [None, None] if ';' in content_type: ret = content_type.split(';', maxsplit=1) else: @@ -96,10 +96,9 @@ def change_content_type(reply, mapping): Return: None (modifies the passed reply). """ - parsed = parse_content_type(reply) - if parsed is None: + content_type, rest = parse_content_type(reply) + if content_type is None: return - content_type, rest = parsed # pylint: disable=unpacking-non-sequence try: content_type = mapping[content_type] except KeyError: