From 8702c9357d71b38fcc1175b3a234c563b995d3d7 Mon Sep 17 00:00:00 2001 From: Schamper Date: Tue, 6 Sep 2016 10:24:36 +0200 Subject: Fix decoding when content-encoding: none --- netlib/encoding.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'netlib/encoding.py') diff --git a/netlib/encoding.py b/netlib/encoding.py index a3c83c46..040aceaf 100644 --- a/netlib/encoding.py +++ b/netlib/encoding.py @@ -34,7 +34,7 @@ def decode(encoded, encoding, errors='strict'): Raises: ValueError, if decoding fails. """ - if len(encoded) == 0: + if len(encoded) == 0 or encoding == "none": return encoded global _cache -- cgit v1.2.3 From c16417248ce571ad09ea18ac7280472b448c23f4 Mon Sep 17 00:00:00 2001 From: Schamper Date: Tue, 6 Sep 2016 10:37:24 +0200 Subject: Also fix for encoding --- netlib/encoding.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'netlib/encoding.py') diff --git a/netlib/encoding.py b/netlib/encoding.py index 040aceaf..d25af3e5 100644 --- a/netlib/encoding.py +++ b/netlib/encoding.py @@ -76,7 +76,7 @@ def encode(decoded, encoding, errors='strict'): Raises: ValueError, if encoding fails. """ - if len(decoded) == 0: + if len(decoded) == 0 or encoding == "none": return decoded global _cache -- cgit v1.2.3 From 5728a1c900dc566cd9cce728266204572c486d8a Mon Sep 17 00:00:00 2001 From: Schamper Date: Tue, 6 Sep 2016 17:00:08 +0200 Subject: Make 'none' synonymous to 'identity' --- netlib/encoding.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'netlib/encoding.py') diff --git a/netlib/encoding.py b/netlib/encoding.py index d25af3e5..9b8b3868 100644 --- a/netlib/encoding.py +++ b/netlib/encoding.py @@ -34,7 +34,7 @@ def decode(encoded, encoding, errors='strict'): Raises: ValueError, if decoding fails. """ - if len(encoded) == 0 or encoding == "none": + if len(encoded) == 0: return encoded global _cache @@ -76,7 +76,7 @@ def encode(decoded, encoding, errors='strict'): Raises: ValueError, if encoding fails. """ - if len(decoded) == 0 or encoding == "none": + if len(decoded) == 0: return decoded global _cache @@ -162,12 +162,14 @@ def encode_deflate(content): custom_decode = { + "none": identity, "identity": identity, "gzip": decode_gzip, "deflate": decode_deflate, "br": decode_brotli, } custom_encode = { + "none": identity, "identity": identity, "gzip": encode_gzip, "deflate": encode_deflate, -- cgit v1.2.3