diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:24:48 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:24:48 +0200 |
| commit | 8fbed971ae4a84e875f1072805b17cc7ada39fad (patch) | |
| tree | 09c31384b2b1d22680534af8ff40ae724a13e05b /libmproxy/console | |
| parent | ee6969c1fac20d592e0775bfe074b4bcfcf83461 (diff) | |
| parent | 0af060897854e0e0fc8207af02d22bec9eacab12 (diff) | |
| download | mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.gz mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.bz2 mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.zip | |
Merge pull request #768 from mitmproxy/netlib-http1-refactor
Adjust to netlib changes
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/common.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index ae3dd61e..13374b25 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -4,7 +4,7 @@ import urwid import urwid.util import os -from netlib.http.semantics import CONTENT_MISSING +from netlib.http import CONTENT_MISSING import netlib.utils from .. import utils diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 3e13fab4..8220c1e7 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -6,7 +6,7 @@ import sys import urwid from netlib import odict -from netlib.http.semantics import CONTENT_MISSING, Headers +from netlib.http import CONTENT_MISSING, Headers from . import common, grideditor, signals, searchable, tabs from . import flowdetailview from .. import utils, controller, contentviews |