remove html outline contentview, fix mitmproxy#2572

Oliver-Fish · Sep 14, 2017 · 289ddfe · 289ddfe
1 parent 9716b3d
commit 289ddfe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/mitmproxy/contentviews/__init__.py b/mitmproxy/contentviews/__init__.py
@@ -22,7 +22,7 @@
 from mitmproxy.net import http
 from mitmproxy.utils import strutils
 from . import (
-    auto, raw, hex, json, xml_html, html_outline, wbxml, javascript, css,
+    auto, raw, hex, json, xml_html, wbxml, javascript, css,
     urlencoded, multipart, image, query, protobuf
 )
 from .base import View, VIEW_CUTOFF, KEY_MAX, format_text, format_dict, TViewResult
@@ -168,7 +168,6 @@ def get_content_view(viewmode: View, data: bytes, **metadata):
 add(json.ViewJSON())
 add(xml_html.ViewXmlHtml())
 add(wbxml.ViewWBXML())
-add(html_outline.ViewHTMLOutline())
 add(javascript.ViewJavaScript())
 add(css.ViewCSS())
 add(urlencoded.ViewURLEncoded())

diff --git a/mitmproxy/contentviews/html_outline.py b/mitmproxy/contentviews/html_outline.py
diff --git a/setup.py b/setup.py
@@ -66,7 +66,6 @@
         "click>=6.2, <7",
         "cryptography>=2.0,<2.1",
         "h2>=3.0, <4",
-        "html2text>=2016.1.8, <=2016.9.19",
         "hyperframe>=5.0, <6",
         "kaitaistruct>=0.7, <0.8",
         "ldap3>=2.2.0, <2.4",

diff --git a/test/mitmproxy/contentviews/test_html_outline.py b/test/mitmproxy/contentviews/test_html_outline.py