python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2025-02-13 13:18:45 +02:00
Code

Clean up

Browse Source
This commit is contained in:
Jakub Roztocil 2013-01-03 13:49:41 +01:00
parent 1913b0d438
commit d84d94dd55
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -1102,7 +1102,7 @@ Changelog
* `0.4.0-alpha`_ * `0.4.0-alpha`_
* Requests v1.0.3. * Requests v1.0.3.
* Added `httpie` management command. * Added ``httpie`` management command.
* Added support for credentials in URL. * Added support for credentials in URL.
* Added ``--no-option`` for every ``--option`` to be config-friendly. * Added ``--no-option`` for every ``--option`` to be config-friendly.
* Mutually exclusive arguments can be specified multiple times. The * Mutually exclusive arguments can be specified multiple times. The

9
httpie/sessions.py
View File

@ -34,7 +34,6 @@ def get_response(name, request_kwargs, config_dir, read_only=False):
name=request_kwargs['headers'].get('Host', None) name=request_kwargs['headers'].get('Host', None)
or urlparse(request_kwargs['url']).netloc.split('@')[-1] or urlparse(request_kwargs['url']).netloc.split('@')[-1]
) )
session = Session(host, name) session = Session(host, name)
session.load() session.load()
@ -49,15 +48,17 @@ def get_response(name, request_kwargs, config_dir, read_only=False):
elif session.auth: elif session.auth:
request_kwargs['auth'] = session.auth request_kwargs['auth'] = session.auth
rsession = requests.Session() requests_session = requests.Session()
try: try:
response = rsession.request(cookies=session.cookies, **request_kwargs) response = requests_session.request(cookies=session.cookies,
**request_kwargs)
except Exception: except Exception:
raise raise
else: else:
# Existing sessions with `read_only=True` don't get updated. # Existing sessions with `read_only=True` don't get updated.
if session.is_new or not read_only: if session.is_new or not read_only:
session.cookies = rsession.cookies session.cookies = requests_session.cookies
session.save() session.save()
return response return response

1
setup.py
View File

@ -12,7 +12,6 @@ if sys.argv[-1] == 'test':
requirements = [ requirements = [
# Debian has only requests==0.10.1 and httpie.deb depends on that.
'requests>=1.0.3', 'requests>=1.0.3',
'Pygments>=1.5' 'Pygments>=1.5'
] ]