Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-01-30 23:09:44 +00:00
Code Issues Projects Releases Wiki Activity

Revert "add strutils.replace_surrogates"

Browse Source 
This reverts commit 15ae88db08dbf2725c8c9f945f2006c4b2a10d46.
This commit is contained in:
Maximilian Hils 2017-01-06 00:58:29 +01:00
parent c21ee90deb
commit b1ec7e78cd
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mitmproxy/utils/strutils.py
View File

@ -25,17 +25,6 @@ def always_str(str_or_bytes: Optional[AnyStr], *decode_args) -> Optional[str]:
raise TypeError("Expected str or bytes, but got {}.".format(type(str_or_bytes).__name__)) raise TypeError("Expected str or bytes, but got {}.".format(type(str_or_bytes).__name__))
def replace_surrogates(text: str, errors='replace') -> str:
"""Convert surrogates to replacement characters (e.g., "\udc80" becomes "<EFBFBD>")
by applying a different error handler.
Uses the "replace" error handler by default, but any input
error handler may be specified.
For an introduction to surrogateescape, see https://www.python.org/dev/peps/pep-0383/.
"""
return text.encode('utf-8', 'surrogateescape').decode('utf-8', errors)
# Translate control characters to "safe" characters. This implementation initially # Translate control characters to "safe" characters. This implementation initially
# replaced them with the matching control pictures (http://unicode.org/charts/PDF/U2400.pdf), # replaced them with the matching control pictures (http://unicode.org/charts/PDF/U2400.pdf),
# but that turned out to render badly with monospace fonts. We are back to "." therefore. # but that turned out to render badly with monospace fonts. We are back to "." therefore.

5
test/mitmproxy/utils/test_strutils.py
View File

@ -19,11 +19,6 @@ def test_always_str():
assert strutils.always_str(None) is None assert strutils.always_str(None) is None
def test_replace_surrogates():
assert strutils.replace_surrogates("foo") == "foo"
assert strutils.replace_surrogates("bar \udc80 baz") == "bar <20> baz"
def test_escape_control_characters(): def test_escape_control_characters():
assert strutils.escape_control_characters(u"one") == u"one" assert strutils.escape_control_characters(u"one") == u"one"
assert strutils.escape_control_characters(u"\00ne") == u".ne" assert strutils.escape_control_characters(u"\00ne") == u".ne"