diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-05-25 19:16:02 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-25 19:16:02 -0700 |
commit | 7a8da48a306dfc8e43239d7f2a141c465e40ab77 (patch) | |
tree | f3f6c73f5aecb2686fb228671ae1766ac1a3fa33 /netlib | |
parent | f7e77d543bcca84f75e09440841aacb582881da2 (diff) | |
download | mitmproxy-7a8da48a306dfc8e43239d7f2a141c465e40ab77.tar.gz mitmproxy-7a8da48a306dfc8e43239d7f2a141c465e40ab77.tar.bz2 mitmproxy-7a8da48a306dfc8e43239d7f2a141c465e40ab77.zip |
escaped_str_to_bytes: support unicode on python 2
Diffstat (limited to 'netlib')
-rw-r--r-- | netlib/utils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/netlib/utils.py b/netlib/utils.py index 7499f71f..fe11cb5b 100644 --- a/netlib/utils.py +++ b/netlib/utils.py @@ -439,10 +439,14 @@ def escaped_str_to_bytes(data): """ Take an escaped string and return the unescaped bytes equivalent. """ - if not isinstance(data, str): + if not isinstance(data, six.string_types): + if six.PY2: + raise ValueError("data must be str or unicode") raise ValueError("data must be str") if six.PY2: + if isinstance(data, unicode): + data = data.encode("utf8") return data.decode("string-escape") # This one is difficult - we use an undocumented Python API here |