aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-04 13:30:18 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-04 13:30:18 +1200
commit783e904b924d7f8d4448512b03383d429f5cf7de (patch)
tree0b5bfd29f218776023d44e417e3957d29aef363c /libmproxy/console
parent249bb4a2ac6dc509ded59f6cafe5e1a25f568098 (diff)
parentfbb2633dd3e8bb4764e4d7627bec83bf73f4ae45 (diff)
downloadmitmproxy-783e904b924d7f8d4448512b03383d429f5cf7de.tar.gz
mitmproxy-783e904b924d7f8d4448512b03383d429f5cf7de.tar.bz2
mitmproxy-783e904b924d7f8d4448512b03383d429f5cf7de.zip
Merge pull request #603 from Kriechi/remove-contrib
replace contrib libraries with pypi dependencies
Diffstat (limited to 'libmproxy/console')
-rw-r--r--libmproxy/console/contentview.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py
index fd28a83a..e4ffcd47 100644
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@@ -9,13 +9,14 @@ from PIL.ExifTags import TAGS
import subprocess
import traceback
import urwid
+import html2text
import netlib.utils
from netlib import odict
from . import common, signals
from .. import utils, encoding
-from ..contrib import jsbeautifier, html2text
+from ..contrib import jsbeautifier
from ..contrib.wbxml.ASCommandResponse import ASCommandResponse
try: