diff options
| author | Jason <jason.daurus@gmail.com> | 2016-06-17 21:58:24 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-06-17 21:58:24 +0800 |
| commit | c82d27b2a215c075dba71254cafdc86e98e0f2d9 (patch) | |
| tree | 84324135951cf67617e4887923bee0627c1d1085 /test/pathod/test_language_http2.py | |
| parent | 6ad2f13341208b8460eae0dd0105c3109e773bae (diff) | |
| parent | 9c6199db9be34fad18eaedb86463333671ae190a (diff) | |
| download | mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.tar.gz mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.tar.bz2 mitmproxy-c82d27b2a215c075dba71254cafdc86e98e0f2d9.zip | |
Merge branch 'master' into settings
Conflicts:
mitmproxy/web/static/app.css
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
Diffstat (limited to 'test/pathod/test_language_http2.py')
| -rw-r--r-- | test/pathod/test_language_http2.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/pathod/test_language_http2.py b/test/pathod/test_language_http2.py index a2bffe63..f4b34047 100644 --- a/test/pathod/test_language_http2.py +++ b/test/pathod/test_language_http2.py @@ -1,12 +1,13 @@ from six import BytesIO -import netlib from netlib import tcp from netlib.http import user_agents from pathod import language from pathod.language import http2 -import tutils +from pathod.protocols.http2 import HTTP2StateProtocol + +from . import tutils def parse_request(s): @@ -20,7 +21,7 @@ def parse_response(s): def default_settings(): return language.Settings( request_host="foo.com", - protocol=netlib.http.http2.HTTP2Protocol(tcp.TCPClient(('localhost', 1234))) + protocol=HTTP2StateProtocol(tcp.TCPClient(('localhost', 1234))) ) |