aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/contentviews.py
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/contentviews.py')
-rw-r--r--mitmproxy/contentviews.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/mitmproxy/contentviews.py b/mitmproxy/contentviews.py
index 42061a8c..28c57f06 100644
--- a/mitmproxy/contentviews.py
+++ b/mitmproxy/contentviews.py
@@ -28,7 +28,6 @@ from PIL import ExifTags
from PIL import Image
from six.moves import cStringIO as StringIO
-import mitmproxy.utils
from mitmproxy import exceptions
from mitmproxy.contrib import jsbeautifier
from mitmproxy.contrib.wbxml import ASCommandResponse
@@ -62,6 +61,14 @@ VIEW_CUTOFF = 512
KEY_MAX = 30
+def pretty_json(s):
+ try:
+ p = json.loads(s)
+ except ValueError:
+ return None
+ return json.dumps(p, sort_keys=True, indent=4)
+
+
def format_dict(d):
"""
Helper function that transforms the given dictionary into a list of
@@ -215,9 +222,9 @@ class ViewJSON(View):
content_types = ["application/json"]
def __call__(self, data, **metadata):
- pretty_json = mitmproxy.utils.pretty_json(data)
- if pretty_json:
- return "JSON", format_text(pretty_json)
+ pj = pretty_json(data)
+ if pj:
+ return "JSON", format_text(pj)
class ViewHTML(View):