aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-06 13:39:38 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-06 13:39:38 -0700
commit2ee5e8ef0e632545038a72f0cedc0320c59b00ff (patch)
tree458b9fd2ad5817c79101388a036e82d4ffb54b95
parent6447c8ae2256b0e074a04307a748d61f990e98d4 (diff)
downloadmitmproxy-2ee5e8ef0e632545038a72f0cedc0320c59b00ff.tar.gz
mitmproxy-2ee5e8ef0e632545038a72f0cedc0320c59b00ff.tar.bz2
mitmproxy-2ee5e8ef0e632545038a72f0cedc0320c59b00ff.zip
fix NestedMessage encoding
-rw-r--r--pathod/language/base.py2
-rw-r--r--test/pathod/test_language_http.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pathod/language/base.py b/pathod/language/base.py
index 6cafdebd..25f3fd1a 100644
--- a/pathod/language/base.py
+++ b/pathod/language/base.py
@@ -555,7 +555,7 @@ class NestedMessage(Token):
try:
self.parsed = self.nest_type(
self.nest_type.expr().parseString(
- value.val,
+ value.val.decode(),
parseAll=True
)
)
diff --git a/test/pathod/test_language_http.py b/test/pathod/test_language_http.py
index 0ef1e109..18059e3a 100644
--- a/test/pathod/test_language_http.py
+++ b/test/pathod/test_language_http.py
@@ -324,7 +324,7 @@ def test_user_agent():
def test_nested_response():
e = http.NestedResponse.expr()
v = e.parseString("s'200'")[0]
- assert v.value.val == "200"
+ assert v.value.val == b"200"
tutils.raises(
language.ParseException,
e.parseString,