Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-01-31 15:28:50 +00:00
Code Issues Projects Releases Wiki Activity

Py3: inner_repr and escape_unprintables

Browse Source
This commit is contained in:
Shadab Zafar 2016-05-07 23:45:03 +05:30
parent f3932b27da
commit 88e42bab6d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pathod/utils.py
View File

@ -2,6 +2,8 @@ import os
import sys import sys
import netlib.utils import netlib.utils
import six
SIZE_UNITS = dict( SIZE_UNITS = dict(
b=1024 ** 0, b=1024 ** 0,
@ -58,7 +60,7 @@ def inner_repr(s):
Returns the inner portion of a string or unicode repr (i.e. without the Returns the inner portion of a string or unicode repr (i.e. without the
quotes) quotes)
""" """
if isinstance(s, unicode): if six.PY2 and isinstance(s, unicode):
return repr(s)[2:-1] return repr(s)[2:-1]
else: else:
return repr(s)[1:-1] return repr(s)[1:-1]
@ -70,7 +72,10 @@ def escape_unprintables(s):
""" """
s = s.replace("\r\n", "PATHOD_MARKER_RN") s = s.replace("\r\n", "PATHOD_MARKER_RN")
s = s.replace("\n", "PATHOD_MARKER_N") s = s.replace("\n", "PATHOD_MARKER_N")
s = inner_repr(s) if six.PY2:
s = inner_repr(s)
else:
s = s.encode('unicode_escape').decode('ascii')
s = s.replace("PATHOD_MARKER_RN", "\n") s = s.replace("PATHOD_MARKER_RN", "\n")
s = s.replace("PATHOD_MARKER_N", "\n") s = s.replace("PATHOD_MARKER_N", "\n")
return s return s