diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-08 15:36:37 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-08 15:36:37 +0200 |
| commit | 4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49 (patch) | |
| tree | d585d558f1860869f00e00199761894d6bd47834 /libmproxy/protocol/http.py | |
| parent | c3ba98b68127b1a0d974e564c0c9af97b97f2a06 (diff) | |
| parent | 8dfa15c2d460839667092e578311fad53cf7bea9 (diff) | |
| download | mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.gz mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.bz2 mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.zip | |
Merge branch 'master' into readthedocs
Diffstat (limited to 'libmproxy/protocol/http.py')
| -rw-r--r-- | libmproxy/protocol/http.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index fbf4ac9b..93972111 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -3,7 +3,6 @@ from __future__ import (absolute_import, print_function, division) from netlib import tcp from netlib.http import http1, HttpErrorConnClosed, HttpError, Headers from netlib.http.semantics import CONTENT_MISSING -from netlib import odict from netlib.tcp import NetLibError, Address from netlib.http.http1 import HTTP1Protocol from netlib.http.http2 import HTTP2Protocol |