From d84d94dd5523de05929f5d560ca2daaabc4dc72e Mon Sep 17 00:00:00 2001 From: Jakub Roztocil Date: Thu, 3 Jan 2013 13:49:41 +0100 Subject: [PATCH] Clean up --- README.rst | 2 +- httpie/sessions.py | 9 +++++---- setup.py | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 428fff45..84e91faa 100644 --- a/README.rst +++ b/README.rst @@ -1102,7 +1102,7 @@ Changelog * `0.4.0-alpha`_ * Requests v1.0.3. - * Added `httpie` management command. + * Added ``httpie`` management command. * Added support for credentials in URL. * Added ``--no-option`` for every ``--option`` to be config-friendly. * Mutually exclusive arguments can be specified multiple times. The diff --git a/httpie/sessions.py b/httpie/sessions.py index 4e89edee..b044736a 100644 --- a/httpie/sessions.py +++ b/httpie/sessions.py @@ -34,7 +34,6 @@ def get_response(name, request_kwargs, config_dir, read_only=False): name=request_kwargs['headers'].get('Host', None) or urlparse(request_kwargs['url']).netloc.split('@')[-1] ) - session = Session(host, name) session.load() @@ -49,15 +48,17 @@ def get_response(name, request_kwargs, config_dir, read_only=False): elif session.auth: request_kwargs['auth'] = session.auth - rsession = requests.Session() + requests_session = requests.Session() + try: - response = rsession.request(cookies=session.cookies, **request_kwargs) + response = requests_session.request(cookies=session.cookies, + **request_kwargs) except Exception: raise else: # Existing sessions with `read_only=True` don't get updated. if session.is_new or not read_only: - session.cookies = rsession.cookies + session.cookies = requests_session.cookies session.save() return response diff --git a/setup.py b/setup.py index 03535479..dcfd8e44 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ if sys.argv[-1] == 'test': requirements = [ - # Debian has only requests==0.10.1 and httpie.deb depends on that. 'requests>=1.0.3', 'Pygments>=1.5' ]