holm/httpie-cli
1
1
Fork 0
forked from extern/httpie-cli
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch UnicodeDecodeError when embedding file via =@ or :=@.

Browse Source
This commit is contained in:
Jakub Roztocil 2014-01-25 14:56:56 +01:00
parent 748a0a480d
commit 1aa77017d5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
httpie/input.py
View File

@ -608,7 +608,13 @@ def parse_items(items, data=None, headers=None, files=None, params=None):
with open(os.path.expanduser(value), 'rb') as f:
value = f.read().decode('utf8')
except IOError as e:
raise ParseError('%s": %s' % (item.orig, e))
raise ParseError('"%s": %s' % (item.orig, e))
except UnicodeDecodeError:
raise ParseError(
'"%s": cannot embed the content of "%s",'
' not a UTF8 or ASCII-encoded text file'
% (item.orig, item.value)
)
if item.sep in SEP_GROUP_RAW_JSON_ITEMS:
try: