Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1531 from Schamper/encoding-patch

Browse Source 
Fix decoding when content-encoding: none
This commit is contained in:
Thomas Kriechbaumer 2016-09-06 20:29:59 +02:00 committed by GitHub
commit 7841d73cb2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netlib/encoding.py
View File

@ -162,12 +162,14 @@ def encode_deflate(content):
custom_decode = { custom_decode = {
"none": identity,
"identity": identity, "identity": identity,
"gzip": decode_gzip, "gzip": decode_gzip,
"deflate": decode_deflate, "deflate": decode_deflate,
"br": decode_brotli, "br": decode_brotli,
} }
custom_encode = { custom_encode = {
"none": identity,
"identity": identity, "identity": identity,
"gzip": encode_gzip, "gzip": encode_gzip,
"deflate": encode_deflate, "deflate": encode_deflate,

10
test/netlib/test_encoding.py
View File

@ -4,9 +4,13 @@ import pytest
from netlib import encoding, tutils from netlib import encoding, tutils
def test_identity(): @pytest.mark.parametrize("encoder", [
assert b"string" == encoding.decode(b"string", "identity") 'identity',
assert b"string" == encoding.encode(b"string", "identity") 'none',
])
def test_identity(encoder):
assert b"string" == encoding.decode(b"string", encoder)
assert b"string" == encoding.encode(b"string", encoder)
with tutils.raises(ValueError): with tutils.raises(ValueError):
encoding.encode(b"string", "nonexistent encoding") encoding.encode(b"string", "nonexistent encoding")