diff options
| author | Shadab Zafar <dufferzafar0@gmail.com> | 2016-06-28 17:35:56 +0530 |
|---|---|---|
| committer | Shadab Zafar <dufferzafar0@gmail.com> | 2016-07-02 21:15:20 +0530 |
| commit | 5b5a3ffa8e5650012fcf278146305aabb322b975 (patch) | |
| tree | 063ee60786dc3ce7cd05d39dcda3625d9bf71552 /netlib | |
| parent | f70fd1b4b6204195ad85669abe8d275a0e97fdf2 (diff) | |
| download | mitmproxy-5b5a3ffa8e5650012fcf278146305aabb322b975.tar.gz mitmproxy-5b5a3ffa8e5650012fcf278146305aabb322b975.tar.bz2 mitmproxy-5b5a3ffa8e5650012fcf278146305aabb322b975.zip | |
netlib: condition on PY2 rather than on PY3
Let's just hope PY4 doesn't break this!
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/strutils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/strutils.py b/netlib/strutils.py index 414b2e57..cfcdf485 100644 --- a/netlib/strutils.py +++ b/netlib/strutils.py @@ -19,12 +19,12 @@ def native(s, *encoding_opts): """ if not isinstance(s, (six.binary_type, six.text_type)): raise TypeError("%r is neither bytes nor unicode" % s) - if six.PY3: - if isinstance(s, six.binary_type): - return s.decode(*encoding_opts) - else: + if six.PY2: if isinstance(s, six.text_type): return s.encode(*encoding_opts) + else: + if isinstance(s, six.binary_type): + return s.decode(*encoding_opts) return s |