Skip to content

Commit

Permalink
TODOs
Browse files Browse the repository at this point in the history
  • Loading branch information
jkbrzt committed Apr 12, 2013
1 parent 289e9b8 commit 1681a4d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions httpie/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def get_requests_kwargs(args):
}

auto_json = args.data and not args.form
# FIXME: Accept is set to JSON with `http url @./file.txt`.
if args.json or auto_json:
implicit_headers['Accept'] = 'application/json'
if args.json or (auto_json and args.data):
Expand Down
4 changes: 4 additions & 0 deletions tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,8 @@ class RequestBodyFromFilePathTest(BaseTestCase):
"""
def test_request_body_from_file_by_path(self):
# FIXME: *sometimes* fails on py33, the content-type is form.
# https://github.com/jkbr/httpie/issues/140
r = http(
'POST',
httpbin('/post'),
Expand All @@ -803,6 +805,8 @@ def test_request_body_from_file_by_path(self):
self.assertIn('"Content-Type": "text/plain"', r)

def test_request_body_from_file_by_path_with_explicit_content_type(self):
# FIXME: *sometimes* fails on py33, the content-type is form.
# https://github.com/jkbr/httpie/issues/140
r = http(
'POST',
httpbin('/post'),
Expand Down

0 comments on commit 1681a4d

Please sign in to comment.