From 303b6df447724eb051b65c7e93880a9a90d2b0aa Mon Sep 17 00:00:00 2001
From: dufferzafar <dufferzafar0@gmail.com>
Date: Tue, 26 Jul 2016 00:58:09 -0700
Subject: [PATCH] Use jsbeautifier from pip

---
 mitmproxy/contentviews.py | 4 ++--
 setup.py                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mitmproxy/contentviews.py b/mitmproxy/contentviews.py
index e155bc01e..3aedf08a3 100644
--- a/mitmproxy/contentviews.py
+++ b/mitmproxy/contentviews.py
@@ -31,7 +31,7 @@ from PIL import Image
 from six import BytesIO
 
 from mitmproxy import exceptions
-from mitmproxy.contrib import jsbeautifier
+import jsbeautifier
 from mitmproxy.contrib.wbxml import ASCommandResponse
 from netlib import http
 from netlib import multidict
@@ -398,7 +398,7 @@ class ViewJavaScript(View):
     def __call__(self, data, **metadata):
         opts = jsbeautifier.default_options()
         opts.indent_size = 2
-        res = jsbeautifier.beautify(data, opts)
+        res = jsbeautifier.beautify(data.decode(), opts)
         return "JavaScript", format_text(res)
 
 
diff --git a/setup.py b/setup.py
index 23eb3b268..1183d3e16 100644
--- a/setup.py
+++ b/setup.py
@@ -111,6 +111,7 @@ setup(
         ],
         'contentviews': [
             "cssutils>=1.0.1, <1.1",
+            "jsbeautifier>=1.6.3"
             # TODO: Find Python 3 replacements
             # "protobuf>=2.6.1, <2.7",
             # "pyamf>=0.8.0, <0.9",