McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Allows native_str() to optionally ignore errors

This commit is contained in:
Remi Rampin 2014-09-01 21:43:32 -04:00
parent 00c69bd704
commit a8a5ad41a2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pip/compat.py
View File

@ -47,9 +47,9 @@ if sys.version_info >= (3,):
except UnicodeDecodeError:
return s.decode('utf_8')
def native_str(s):
def native_str(s, replace=False):
if isinstance(s, bytes):
return s.decode('utf-8')
return s.decode('utf-8', 'replace' if replace else 'strict')
return s
def get_http_message_param(http_message, param, default_value):
@ -66,7 +66,8 @@ else:
def console_to_str(s):
return s
def native_str(s):
def native_str(s, replace=False):
# Replace is ignored -- unicode to UTF-8 can't fail
if isinstance(s, unicode):
return s.encode('utf-8')
return s