aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod/language.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-10-28 22:18:06 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-10-28 22:18:06 +1300
commit61f8992fbffac936ac058b64ed7ac00f21127df9 (patch)
tree9f3e3280d538a7837092d5b15e8d97d495a56d7b /libpathod/language.py
parent07560ffe307f13ffb5a8fa4ef593902cc69807b9 (diff)
downloadmitmproxy-61f8992fbffac936ac058b64ed7ac00f21127df9.tar.gz
mitmproxy-61f8992fbffac936ac058b64ed7ac00f21127df9.tar.bz2
mitmproxy-61f8992fbffac936ac058b64ed7ac00f21127df9.zip
Change response spec format to code[:features]
Reason message is now specified as just another feature with the "m" mnemonic.
Diffstat (limited to 'libpathod/language.py')
-rw-r--r--libpathod/language.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/libpathod/language.py b/libpathod/language.py
index 7f1d8cec..76676517 100644
--- a/libpathod/language.py
+++ b/libpathod/language.py
@@ -586,7 +586,8 @@ class Reason(_Component):
@classmethod
def expr(klass):
- e = Value.copy()
+ e = pp.Literal("m").suppress()
+ e = e + Value
return e.setParseAction(lambda x: klass(*x))
def values(self, settings):
@@ -724,7 +725,8 @@ class Response(Message):
InjectAt,
ShortcutContentType,
ShortcutLocation,
- Raw
+ Raw,
+ Reason
)
logattrs = ["code", "reason", "version", "body"]
def __init__(self):
@@ -749,7 +751,6 @@ class Response(Message):
resp = pp.And(
[
Code.expr(),
- pp.Optional(Reason.expr()),
pp.ZeroOrMore(Sep + atom)
]
)