aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/encoding.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-21 00:44:17 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-21 00:44:17 +0200
commit73586b1be95d97f0be76e85223b53d1f4ed697d6 (patch)
tree47754fc26d196355babbff026df035271953c5d0 /netlib/encoding.py
parentdaebd1bd275a398d42cc4dbfe5c6399c7fe3b3a0 (diff)
downloadmitmproxy-73586b1be95d97f0be76e85223b53d1f4ed697d6.tar.gz
mitmproxy-73586b1be95d97f0be76e85223b53d1f4ed697d6.tar.bz2
mitmproxy-73586b1be95d97f0be76e85223b53d1f4ed697d6.zip
python 3++
Diffstat (limited to 'netlib/encoding.py')
-rw-r--r--netlib/encoding.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/netlib/encoding.py b/netlib/encoding.py
index 8ac59905..4c11273b 100644
--- a/netlib/encoding.py
+++ b/netlib/encoding.py
@@ -8,27 +8,25 @@ import zlib
from .utils import always_byte_args
-ENCODINGS = {b"identity", b"gzip", b"deflate"}
+ENCODINGS = {"identity", "gzip", "deflate"}
-@always_byte_args("ascii", "ignore")
def decode(e, content):
encoding_map = {
- b"identity": identity,
- b"gzip": decode_gzip,
- b"deflate": decode_deflate,
+ "identity": identity,
+ "gzip": decode_gzip,
+ "deflate": decode_deflate,
}
if e not in encoding_map:
return None
return encoding_map[e](content)
-@always_byte_args("ascii", "ignore")
def encode(e, content):
encoding_map = {
- b"identity": identity,
- b"gzip": encode_gzip,
- b"deflate": encode_deflate,
+ "identity": identity,
+ "gzip": encode_gzip,
+ "deflate": encode_deflate,
}
if e not in encoding_map:
return None