Validate "file fields (name@/path) require --form / -f".

httpie/input.py

@@ -89,7 +89,6 @@ class Parser(argparse.ArgumentParser):
 
     #noinspection PyMethodOverriding
     def parse_args(self, env, args=None, namespace=None):
-
         args = super(Parser, self).parse_args(args, namespace)
 
         self._process_output_options(args, env)
@@ -183,7 +182,13 @@ class Parser(argparse.ArgumentParser):
                     ' --form is used. File fields: %s'
                     % ','.join(args.files.keys()))
 
-            fn, data = list(args.files.values())[0]
+            field_name = list(args.files.keys())[0]
+            fn, data = args.files[field_name]
+            if field_name:
+                # `http url name@/path' doesn't make sense here.
+                self.error(
+                    'file fields (name@/path) require --form / -f')
+
             self._body_from_file(args, data)
 
             # Reset files

httpie/models.py

@@ -120,10 +120,13 @@ class HTTPMessage(object):
             except AttributeError:
                 # requests < 0.12.1
                 body = request._enc_data
+
             if isinstance(body, dict):
                 #noinspection PyUnresolvedReferences
                 body = type(request)._encode_params(body)
-            body = body.encode('utf8')
+
+            if isinstance(body, str):
+                body = body.encode('utf8')
 
         return cls(line=request_line,
                    headers=headers,

tests/tests.py

@@ -515,6 +515,17 @@ class VerboseFlagTest(BaseTestCase):
         self.assertIn('HTTP/1.1 200', r)
         self.assertIn('foo=bar&baz=bar', r)
 
+    def test_verbose_json(self):
+        r = http(
+            '--verbose',
+            'POST',
+            httpbin('/post'),
+            'foo=bar',
+            'baz=bar'
+        )
+        self.assertIn('HTTP/1.1 200', r)
+        self.assertEqual(r.count('"baz": "bar"'), 2)
+
 
 class MultipartFormDataFileUploadTest(BaseTestCase):