diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-05 15:17:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 15:17:18 -0700 |
| commit | 00a35aa8954080d7c9d1800625805f0476498896 (patch) | |
| tree | fc1840e2e6234265b7059e3d87ef3d9be2a28180 /netlib | |
| parent | 317a5178ea8f6f060e95094e92e3c996294c8a09 (diff) | |
| parent | f623b3d99b46f9cdeabdbea31614270cc1832f3b (diff) | |
| download | mitmproxy-00a35aa8954080d7c9d1800625805f0476498896.tar.gz mitmproxy-00a35aa8954080d7c9d1800625805f0476498896.tar.bz2 mitmproxy-00a35aa8954080d7c9d1800625805f0476498896.zip | |
Merge pull request #1297 from dufferzafar/py3-flow-export
Python 3 - test_flow_export
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 |