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 /netlib/http/http2/__init__.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 'netlib/http/http2/__init__.py')
| -rw-r--r-- | netlib/http/http2/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/netlib/http/http2/__init__.py b/netlib/http/http2/__init__.py index 633e6a20..6a979a0d 100644 --- a/netlib/http/http2/__init__.py +++ b/netlib/http/http2/__init__.py @@ -1,8 +1,6 @@ from __future__ import absolute_import, print_function, division -from .connections import HTTP2Protocol from netlib.http.http2 import framereader __all__ = [ - "HTTP2Protocol", "framereader", ] |