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

cleanup

Browse Source
This commit is contained in:
Jakub Roztocil 2013-05-14 12:14:08 +02:00
parent 8e112a6948
commit 6e848b3203
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpie/sessions.py
View File

@ -46,12 +46,8 @@ def get_response(session_name, requests_kwargs, config_dir, read_only=False):
session = Session(path) session = Session(path)
session.load() session.load()
# Merge request and session headers to get final headers for this request.
request_headers = requests_kwargs.get('headers', {}) request_headers = requests_kwargs.get('headers', {})
merged_headers = session.headers.copy() requests_kwargs['headers'] = dict(session.headers, **request_headers)
merged_headers.update(request_headers)
requests_kwargs['headers'] = merged_headers
# Update session headers with the request headers.
session.update_headers(request_headers) session.update_headers(request_headers)
auth = requests_kwargs.get('auth', None) auth = requests_kwargs.get('auth', None)