Browse files

Fixed request/response session cookies.

Closes #113.
  • Loading branch information...
1 parent 79c4120 commit a93d57b58bf060dad8fa9f762c3e7a9be20869e0 @jkbrzt committed Jan 4, 2013
Showing with 7 additions and 3 deletions.
  1. +2 −1 README.rst
  2. +3 −2 httpie/sessions.py
  3. +2 −0 tests/tests.py
View
3 README.rst
@@ -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.
View
5 httpie/sessions.py
@@ -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
@@ -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:
View
2 tests/tests.py
@@ -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)

0 comments on commit a93d57b

Please sign in to comment.