aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/utils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-04-17 16:29:25 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-04-17 16:29:25 +0200
commit08ba987a84a66d1f8f6464f2800b49cdd461dd72 (patch)
tree091b9832ae6dd629f73f008c9060551795d1c439 /netlib/utils.py
parent0c2ad1edb1af013576f4ac31e05b308ffb440116 (diff)
parent7defb5be862a4251da9d7c530593f7e9be3e739e (diff)
downloadmitmproxy-08ba987a84a66d1f8f6464f2800b49cdd461dd72.tar.gz
mitmproxy-08ba987a84a66d1f8f6464f2800b49cdd461dd72.tar.bz2
mitmproxy-08ba987a84a66d1f8f6464f2800b49cdd461dd72.zip
Merge branch 'master' of github.com:mitmproxy/netlib
Diffstat (limited to 'netlib/utils.py')
-rw-r--r--netlib/utils.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/netlib/utils.py b/netlib/utils.py
index 79077ac6..03a70977 100644
--- a/netlib/utils.py
+++ b/netlib/utils.py
@@ -8,6 +8,9 @@ def isascii(s):
return False
return True
+# best way to do it in python 2.x
+def bytes_to_int(i):
+ return int(i.encode('hex'), 16)
def cleanBin(s, fixspacing=False):
"""