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

Merge pull request #43 from jakebasile/master

Browse Source 
-j/--json sets Accept header
This commit is contained in:
Jakub Roztocil 2012-04-14 14:21:08 -07:00
commit 6db93b25d8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpie/__main__.py
View File

@ -124,6 +124,8 @@ def main(args=None,
# JSON/Form content type.
if args.json or (not args.form and data):
if args.method.lower() == 'get' and 'Accept' not in headers:
headers['Accept'] = 'application/json'
if stdin_isatty:
data = json.dumps(data)
if not files and ('Content-Type' not in headers and (data or args.json)):

4
tests/tests.py
View File

@ -94,6 +94,10 @@ class TestHTTPie(BaseTest):
def test_json(self):
response = http('POST', 'http://httpbin.org/post', 'foo=bar')
self.assertIn('"foo": "bar"', response)
response2 = http('-j', 'GET', 'http://httpbin.org/headers')
self.assertIn('"Accept": "application/json"', response2)
response3 = http('-j', 'GET', 'http://httpbin.org/headers', 'Accept:application/xml')
self.assertIn('"Accept": "application/xml"', response3)
def test_form(self):
response = http('--form', 'POST', 'http://httpbin.org/post', 'foo=bar')