diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-05-02 16:24:47 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-05-02 16:24:47 +0200 |
| commit | a7d90ccec7aa32d20ac398b782fbfb985484685b (patch) | |
| tree | f3b397d1788787cc2a9e7c19b0386e3d6a10dbd1 /libmproxy/console/contentview.py | |
| parent | 62ff239e414d4fc912eaab52385eaaf028b7e34c (diff) | |
| parent | e1d3ebb446760be512850ee78030687c30145a79 (diff) | |
| download | mitmproxy-a7d90ccec7aa32d20ac398b782fbfb985484685b.tar.gz mitmproxy-a7d90ccec7aa32d20ac398b782fbfb985484685b.tar.bz2 mitmproxy-a7d90ccec7aa32d20ac398b782fbfb985484685b.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/console/contentview.py')
| -rw-r--r-- | libmproxy/console/contentview.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index aafba4d7..a121dfab 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -6,7 +6,6 @@ import lxml.html import lxml.etree from PIL import Image from PIL.ExifTags import TAGS -import re import subprocess import traceback import urwid @@ -15,7 +14,7 @@ import netlib.utils from netlib import odict from . import common -from .. import utils, encoding, flow +from .. import utils, encoding from ..contrib import jsbeautifier, html2text from ..contrib.wbxml.ASCommandResponse import ASCommandResponse |