Skip to content

Commit

Permalink
Fixed request/response session cookies.
Browse files Browse the repository at this point in the history
Closes #113.
  • Loading branch information
jkbrzt committed Jan 4, 2013
1 parent 79c4120 commit a93d57b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,8 @@ Changelog
*You can click a version name to see a diff with the previous one.*
* `0.4.0-alpha`_
* Requests v1.0.3.
* Python 3.3 compatibility.
* Requests v1.0.4 compatibility.
* Added ``httpie`` management command.
* Added support for credentials in URL.
* Added ``--no-option`` for every ``--option`` to be config-friendly.
Expand Down
5 changes: 3 additions & 2 deletions httpie/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def get_response(name, request_kwargs, config_dir, read_only=False):
session = Session(host, name)
session.load()


# Update session headers with the request headers.
session['headers'].update(request_kwargs.get('headers', {}))
# Use the merged headers for the request
Expand All @@ -49,10 +50,10 @@ def get_response(name, request_kwargs, config_dir, read_only=False):
request_kwargs['auth'] = session.auth

requests_session = requests.Session()
requests_session.cookies = session.cookies

try:
response = requests_session.request(cookies=session.cookies,
**request_kwargs)
response = requests_session.request(**request_kwargs)
except Exception:
raise
else:
Expand Down
2 changes: 2 additions & 0 deletions tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ def http(*args, **kwargs):

class BaseTestCase(unittest.TestCase):

maxDiff = 100000

if is_py26:
def assertIn(self, member, container, msg=None):
self.assertTrue(member in container, msg)
Expand Down

0 comments on commit a93d57b

Please sign in to comment.