diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
commit | ed415877d48251774012bd6aad4be91e9d558b79 (patch) | |
tree | e12a399c6df498f24aa5eeb9652dfaa90ab98dae /pathod/protocols/http2.py | |
parent | 00426534982ab7fba5617ad6422c13483a8e6521 (diff) | |
parent | 7971dce2231bc32c25b962d425d8ad935568a699 (diff) | |
download | mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.gz mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.bz2 mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.zip |
Merge branch 'master' into solidcore
Diffstat (limited to 'pathod/protocols/http2.py')
-rw-r--r-- | pathod/protocols/http2.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pathod/protocols/http2.py b/pathod/protocols/http2.py index a098a14e..3f45ec80 100644 --- a/pathod/protocols/http2.py +++ b/pathod/protocols/http2.py @@ -1,5 +1,6 @@ from netlib.http import http2 -from .. import version, app, language, utils, log +from .. import language + class HTTP2Protocol: |