diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 18:34:43 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 18:34:43 +0200 |
commit | 1ff8f294b459e03e113acb417678a6fd782c2685 (patch) | |
tree | 120fdcb30c706629c26dd46fbee08d9b8e8328e0 /netlib/utils.py | |
parent | 9dea36e43913a642c7f379a55828e1fb7745ba6b (diff) | |
download | mitmproxy-1ff8f294b459e03e113acb417678a6fd782c2685.tar.gz mitmproxy-1ff8f294b459e03e113acb417678a6fd782c2685.tar.bz2 mitmproxy-1ff8f294b459e03e113acb417678a6fd782c2685.zip |
minor encoding fixes
Diffstat (limited to 'netlib/utils.py')
-rw-r--r-- | netlib/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netlib/utils.py b/netlib/utils.py index 8d11bd5b..b9848038 100644 --- a/netlib/utils.py +++ b/netlib/utils.py @@ -26,7 +26,7 @@ def always_byte_args(*encode_args): return decorator -def native(s, encoding="latin-1"): +def native(s, *encoding_opts): """ Convert :py:class:`bytes` or :py:class:`unicode` to the native :py:class:`str` type, using latin1 encoding if conversion is necessary. @@ -37,10 +37,10 @@ def native(s, encoding="latin-1"): raise TypeError("%r is neither bytes nor unicode" % s) if six.PY3: if isinstance(s, six.binary_type): - return s.decode(encoding) + return s.decode(*encoding_opts) else: if isinstance(s, six.text_type): - return s.encode(encoding) + return s.encode(*encoding_opts) return s |