diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:07:41 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:07:41 +0200 |
| commit | 5d5471e429047a3c1cf196c4d2216610a8909b85 (patch) | |
| tree | 88d976fd0464b20104fdbcd4598f42a6a2dd986e /libpathod/pathoc.py | |
| parent | ca97aed4b81ac49b609b0b0b0351c4d26b259ddd (diff) | |
| parent | a0c8b20b7de32d333e72997f518a9159cbea84f6 (diff) | |
| download | mitmproxy-5d5471e429047a3c1cf196c4d2216610a8909b85.tar.gz mitmproxy-5d5471e429047a3c1cf196c4d2216610a8909b85.tar.bz2 mitmproxy-5d5471e429047a3c1cf196c4d2216610a8909b85.zip | |
Merge pull request #15 from mitmproxy/stream
adjust to netlib api changes
Diffstat (limited to 'libpathod/pathoc.py')
| -rw-r--r-- | libpathod/pathoc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 5ccb546b..938dbeba 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -82,7 +82,7 @@ class Pathoc(tcp.TCPClient): r = language.parse_request(self.settings, spec) language.serve(r, self.wfile, self.settings, self.address.host) self.wfile.flush() - ret = list(http.read_response(self.rfile, r.method, None)) + ret = list(http.read_response(self.rfile, r.method.string(), None)) ret.append(self.sslinfo) return Response(*ret) @@ -134,9 +134,9 @@ class Pathoc(tcp.TCPClient): try: req = language.serve(r, self.wfile, self.settings, self.address.host) self.wfile.flush() - resp = http.read_response(self.rfile, r.method, None) + resp = http.read_response(self.rfile, r.method.string(), None) except http.HttpError, v: - print >> fp, "<< HTTP Error:", v.msg + print >> fp, "<< HTTP Error:", v.message except tcp.NetLibTimeout: if ignoretimeout: return |