aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod/pathoc.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-04 17:18:06 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-04 17:18:06 +1200
commit9fda74c65a632bda5176e2ccafbbcab2af27d77d (patch)
treea37c633bda76ae3f2c623bf1d14355279c0631d9 /libpathod/pathoc.py
parent5bee061849b9e48d097b2aba3613e38f7282f36b (diff)
downloadmitmproxy-9fda74c65a632bda5176e2ccafbbcab2af27d77d.tar.gz
mitmproxy-9fda74c65a632bda5176e2ccafbbcab2af27d77d.tar.bz2
mitmproxy-9fda74c65a632bda5176e2ccafbbcab2af27d77d.zip
Clarify language API, stub out nested websocket frames
Diffstat (limited to 'libpathod/pathoc.py')
-rw-r--r--libpathod/pathoc.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py
index 59c88910..f7268193 100644
--- a/libpathod/pathoc.py
+++ b/libpathod/pathoc.py
@@ -270,7 +270,7 @@ class Pathoc(tcp.TCPClient):
"""
with self.log() as log:
if isinstance(r, basestring):
- r = language.parse_requests(r)[0]
+ r = language.parse_pathoc(r)[0]
log(">> %s" % r)
try:
language.serve(r, self.wfile, self.settings)
@@ -316,7 +316,7 @@ class Pathoc(tcp.TCPClient):
"""
with self.log() as log:
if isinstance(r, basestring):
- r = language.parse_requests(r)[0]
+ r = language.parse_pathoc(r)[0]
log(">> %s" % r)
resp, req = None, None
try:
@@ -355,7 +355,7 @@ class Pathoc(tcp.TCPClient):
May raise http.HTTPError, tcp.NetLibError
"""
if isinstance(r, basestring):
- r = language.parse_requests(r)[0]
+ r = language.parse_pathoc(r)[0]
if isinstance(r, language.http.Request):
if r.ws:
return self.websocket_start(r, self.websocket_get_frame)