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

fix .freeze(), improve tests

Browse Source
This commit is contained in:
Maximilian Hils 2016-06-06 13:31:44 -07:00
parent c973fd881f
commit 6447c8ae22
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pathod/language/base.py
View File

@ -578,4 +578,4 @@ class NestedMessage(Token):
def freeze(self, settings): def freeze(self, settings):
f = self.parsed.freeze(settings).spec() f = self.parsed.freeze(settings).spec()
return self.__class__(TokValueLiteral(strutils.bytes_to_escaped_str(f))) return self.__class__(TokValueLiteral(strutils.bytes_to_escaped_str(f.encode())))

11
test/pathod/test_language_base.py
View File

@ -55,8 +55,15 @@ class TestTokValueLiteral:
v = base.TokValueLiteral("f\x00oo") v = base.TokValueLiteral("f\x00oo")
assert v.spec() == repr(v) == r"'f\x00oo'" assert v.spec() == repr(v) == r"'f\x00oo'"
v = base.TokValueLiteral("\"") v = base.TokValueLiteral('"')
assert v.spec() == repr(v) == '\'"\'' assert v.spec() == repr(v) == """ '"' """.strip()
# While pyparsing has a escChar argument for QuotedString,
# escChar only performs scapes single-character escapes and does not work for e.g. r"\x02".
# Thus, we cannot use that option, which means we cannot have single quotes in strings.
# To fix this, we represent single quotes as r"\x07".
v = base.TokValueLiteral("'")
assert v.spec() == r"'\x27'"
def roundtrip(self, spec): def roundtrip(self, spec):
e = base.TokValueLiteral.expr() e = base.TokValueLiteral.expr()

4
test/pathod/test_language_http.py
View File

@ -340,9 +340,7 @@ def test_nested_response():
def test_nested_response_freeze(): def test_nested_response_freeze():
e = http.NestedResponse( e = http.NestedResponse(
base.TokValueLiteral( base.TokValueLiteral(
"200:b'foo':i10,'\\x27'".encode( r"200:b\'foo\':i10,\'\\x27\'"
"string_escape"
)
) )
) )
assert e.freeze({}) assert e.freeze({})