Merge pull request #630 from CrazyPython/patch-1

Clarify error message
2025-01-06 05:39:08 +01:00 · 2017-12-13 21:15:43 +01:00 · 2017-12-13 21:15:43 +01:00 · 02b28093a8
commit 02b28093a8
parent d64e7d8a6a 0aab796960
1 changed files with 2 additions and 1 deletions
--- a/httpie/input.py
+++ b/httpie/input.py
@ -302,7 +302,8 @@ class HTTPieArgumentParser(ArgumentParser):
        """
        if self.args.data:
            self.error('Request body (from stdin or a file) and request '
-                       'data (key=value) cannot be mixed.')
+                       'data (key=value) cannot be mixed. Pass '
+                       '--ignore-stdin to let key/value take priority.')
        self.args.data = getattr(fd, 'buffer', fd).read()

    def _guess_method(self):