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/http.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/http.py')
| -rw-r--r-- | pathod/protocols/http.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pathod/protocols/http.py b/pathod/protocols/http.py index 1f1765cb..d09b5bf2 100644 --- a/pathod/protocols/http.py +++ b/pathod/protocols/http.py @@ -1,6 +1,6 @@ -from netlib import tcp, wsgi -from netlib.exceptions import HttpReadDisconnect, TlsException -from netlib.http import http1, Request +from netlib import wsgi +from netlib.exceptions import TlsException +from netlib.http import http1 from .. import version, language |