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

httpie · Jan 25, 2014 · 1aa7701 · 1aa7701
1 parent 748a0a4
commit 1aa7701
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/httpie/input.py b/httpie/input.py
@@ -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: