aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/utils.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-08-18 17:51:34 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-08-18 17:51:34 +1200
commit15e234558dc3ca2e7fb3a3ef73211994bf541584 (patch)
treedb4491800b0d8024064d199592784d249d083275 /libmproxy/utils.py
parentb70e91bbd4548d95429db6a7830c988d334e9990 (diff)
downloadmitmproxy-15e234558dc3ca2e7fb3a3ef73211994bf541584.tar.gz
mitmproxy-15e234558dc3ca2e7fb3a3ef73211994bf541584.tar.bz2
mitmproxy-15e234558dc3ca2e7fb3a3ef73211994bf541584.zip
Further content view cleaups.
Diffstat (limited to 'libmproxy/utils.py')
-rw-r--r--libmproxy/utils.py35
1 files changed, 0 insertions, 35 deletions
diff --git a/libmproxy/utils.py b/libmproxy/utils.py
index bbde0d49..871beb35 100644
--- a/libmproxy/utils.py
+++ b/libmproxy/utils.py
@@ -81,41 +81,6 @@ def pretty_json(s):
return json.dumps(p, sort_keys=True, indent=4).split("\n")
-def pretty_amf(s):
- """
- Takes an AMF encoded string, decodes it and returns a nicely indented
- string in JSON format.
-
- Reqires pyamf module. The function returns None if pyamf is not
- installed.
- """
- try:
- import pyamf
- from pyamf import remoting
- except ImportError: # pragma nocover
- return None
-
- envelope = remoting.decode(s)
- if not envelope:
- return None
-
- data = {}
- data['amfVersion'] = envelope.amfVersion
- for target, message in iter(envelope):
- one_message = {}
-
- if hasattr(message, 'status'):
- one_message['status'] = message.status
-
- if hasattr(message, 'target'):
- one_message['target'] = message.target
-
- one_message['body'] = message.body
- data[target] = one_message
-
- return json.dumps(data, indent=4)
-
-
def urldecode(s):
"""
Takes a urlencoded string and returns a list of (key, value) tuples.