kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-23 20:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

netlib: condition on PY2 rather than on PY3

Browse Source 
Let's just hope PY4 doesn't break this!
This commit is contained in:
Shadab Zafar
2016-06-28 17:35:56 +05:30
parent f70fd1b4b6
commit 5b5a3ffa8e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netlib/strutils.py
View File

@@ -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