aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'libmproxy/utils.py')
-rw-r--r--libmproxy/utils.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/libmproxy/utils.py b/libmproxy/utils.py
index a6ca55f7..8bd843a0 100644
--- a/libmproxy/utils.py
+++ b/libmproxy/utils.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import (absolute_import, print_function, division)
import os
import datetime
import re
@@ -30,15 +30,16 @@ def isBin(s):
"""
for i in s:
i = ord(i)
- if i < 9:
- return True
- elif i > 13 and i < 32:
- return True
- elif i > 126:
+ if i < 9 or 13 < i < 32 or 126 < i:
return True
return False
+def isMostlyBin(s):
+ s = s[:100]
+ return sum(isBin(ch) for ch in s)/len(s) > 0.3
+
+
def isXML(s):
for i in s:
if i in "\n \t":
@@ -54,7 +55,7 @@ def pretty_json(s):
p = json.loads(s)
except ValueError:
return None
- return json.dumps(p, sort_keys=True, indent=4).split("\n")
+ return json.dumps(p, sort_keys=True, indent=4)
def pretty_duration(secs):