extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2024-11-22 15:53:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Requests 1.0: prefetch; default_headers.

Browse Source
This commit is contained in:
Jakub Roztocil 2012-12-17 17:02:27 +01:00
parent 9ec328ff6f
commit 69e26b8bc8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
httpie/client.py
View File

@ -4,7 +4,7 @@ from pprint import pformat
import requests import requests
import requests.auth import requests.auth
from requests.defaults import defaults from requests.utils import default_headers
from . import sessions from . import sessions
from . import __version__ from . import __version__
@ -40,14 +40,15 @@ def get_response(args, config_dir):
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."""
base_headers = defaults['base_headers'].copy() implicit_headers = {
base_headers['User-Agent'] = DEFAULT_UA 'User-Agent': DEFAULT_UA
}
auto_json = args.data and not args.form auto_json = args.data and not args.form
if args.json or auto_json: if args.json or auto_json:
base_headers['Accept'] = 'application/json' implicit_headers['Accept'] = 'application/json'
if args.data: if args.data:
base_headers['Content-Type'] = JSON implicit_headers['Content-Type'] = JSON
if isinstance(args.data, dict): if isinstance(args.data, dict):
if args.data: if args.data:
@ -60,7 +61,11 @@ def get_requests_kwargs(args):
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
# the `Content-Type` for us. # the `Content-Type` for us.
base_headers['Content-Type'] = FORM implicit_headers['Content-Type'] = FORM
for name, value in implicit_headers.items():
if name not in args.headers:
args.headers[name] = value
credentials = None credentials = None
if args.auth: if args.auth:
@ -70,7 +75,7 @@ def get_requests_kwargs(args):
}[args.auth_type](args.auth.key, args.auth.value) }[args.auth_type](args.auth.key, args.auth.value)
kwargs = { kwargs = {
'prefetch': False, 'stream': True,
'method': args.method.lower(), 'method': args.method.lower(),
'url': args.url, 'url': args.url,
'headers': args.headers, 'headers': args.headers,
@ -85,9 +90,6 @@ def get_requests_kwargs(args):
'files': args.files, 'files': args.files,
'allow_redirects': args.follow, 'allow_redirects': args.follow,
'params': args.params, 'params': args.params,
'config': {
'base_headers': base_headers
}
} }
return kwargs return kwargs