aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod/language.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-10-25 16:20:23 +1300
committerAldo Cortesi <aldo@nullcube.com>2014-10-25 16:20:23 +1300
commit6d8431ab3e96568b3579a85e680371fd20c961aa (patch)
tree35ad1bee42e306692496b7b92808cb9d80c12c4e /libpathod/language.py
parentd4e6c25d45f680df4f807805ce878b498a5fb0c5 (diff)
downloadmitmproxy-6d8431ab3e96568b3579a85e680371fd20c961aa.tar.gz
mitmproxy-6d8431ab3e96568b3579a85e680371fd20c961aa.tar.bz2
mitmproxy-6d8431ab3e96568b3579a85e680371fd20c961aa.zip
Allow specification of multiple patterns from file and on command line
Diffstat (limited to 'libpathod/language.py')
-rw-r--r--libpathod/language.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/libpathod/language.py b/libpathod/language.py
index b4b59167..f40499f6 100644
--- a/libpathod/language.py
+++ b/libpathod/language.py
@@ -1030,7 +1030,7 @@ def parse_response(s):
raise ParseException(v.msg, v.line, v.col)
-def parse_request(s):
+def parse_requests(s):
"""
May raise ParseException
"""
@@ -1039,6 +1039,11 @@ def parse_request(s):
except UnicodeError:
raise ParseException("Spec must be valid ASCII.", 0, 0)
try:
- return Request(Request.expr().parseString(s, parseAll=True))
+ parts = pp.OneOrMore(
+ pp.Group(
+ Request.expr()
+ )
+ ).parseString(s, parseAll=True)
+ return [Request(i) for i in parts]
except pp.ParseException, v:
raise ParseException(v.msg, v.line, v.col)