extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2025-02-16 17:40:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed -j & -v & redirected stdout. Closes #109.

Browse Source
This commit is contained in:
Jakub Roztocil 2012-12-01 15:55:58 +01:00
parent 444a9fa929
commit dd100c2cc4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
httpie/client.py
View File

@ -25,9 +25,9 @@ def get_response(args, config_dir):
'\n>>> requests.request(%s)\n\n' % pformat(requests_kwargs)) '\n>>> requests.request(%s)\n\n' % pformat(requests_kwargs))
if not args.session and not args.session_read_only: if not args.session and not args.session_read_only:
return requests.request(**requests_kwargs) response = requests.request(**requests_kwargs)
else: else:
return sessions.get_response( response = sessions.get_response(
config_dir=config_dir, config_dir=config_dir,
name=args.session or args.session_read_only, name=args.session or args.session_read_only,
request_kwargs=requests_kwargs, request_kwargs=requests_kwargs,
@ -35,6 +35,9 @@ def get_response(args, config_dir):
) )
return response
def get_requests_kwargs(args): def get_requests_kwargs(args):
"""Translate our `args` into `requests.request` keyword arguments.""" """Translate our `args` into `requests.request` keyword arguments."""
@ -48,9 +51,12 @@ def get_requests_kwargs(args):
base_headers['Content-Type'] = JSON base_headers['Content-Type'] = JSON
if isinstance(args.data, dict): if isinstance(args.data, dict):
# If not empty, serialize the data `dict` parsed from arguments. if args.data:
# Otherwise set it to `None` avoid sending "{}". args.data = json.dumps(args.data)
args.data = json.dumps(args.data) if args.data else None else:
# We need to set data to an empty string to prevent requests
# from assigning an empty list to `response.request.data`.
args.data = ''
elif args.form and not args.files: elif args.form and not args.files:
# If sending files, `requests` will set # If sending files, `requests` will set