diff options
| author | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
| commit | 9e869f0aa17cbd202f72bab1540d866f7274a8a1 (patch) | |
| tree | 765b55027aba7685264e838d285c0587d18b9205 /pathod/utils.py | |
| parent | fb639c2e11225531172fb7b452250b58295a5a58 (diff) | |
| parent | 22ecd022a84e1c3762dd425bc9bee2230e393d8d (diff) | |
| download | mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.gz mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.bz2 mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.zip | |
Merge remote-tracking branch 'origin/master' into contentview
Diffstat (limited to 'pathod/utils.py')
| -rw-r--r-- | pathod/utils.py | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pathod/utils.py b/pathod/utils.py index d1e2dd00..8c6d6290 100644 --- a/pathod/utils.py +++ b/pathod/utils.py @@ -2,6 +2,8 @@ import os import sys import netlib.utils +from netlib.utils import bytes_to_escaped_str + SIZE_UNITS = dict( b=1024 ** 0, @@ -53,24 +55,13 @@ def xrepr(s): return repr(s)[1:-1] -def inner_repr(s): - """ - Returns the inner portion of a string or unicode repr (i.e. without the - quotes) - """ - if isinstance(s, unicode): - return repr(s)[2:-1] - else: - return repr(s)[1:-1] - - def escape_unprintables(s): """ Like inner_repr, but preserves line breaks. """ - s = s.replace("\r\n", "PATHOD_MARKER_RN") - s = s.replace("\n", "PATHOD_MARKER_N") - s = inner_repr(s) + s = s.replace(b"\r\n", b"PATHOD_MARKER_RN") + s = s.replace(b"\n", b"PATHOD_MARKER_N") + s = bytes_to_escaped_str(s) s = s.replace("PATHOD_MARKER_RN", "\n") s = s.replace("PATHOD_MARKER_N", "\n") return s |