From be69529dca2a877b87e1728858eb013d2e76a29c Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 23 Oct 2011 16:53:21 -0400 Subject: [PATCH 1/3] oops, debugging prints --- requests/auth.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/requests/auth.py b/requests/auth.py index e9dbce8b..b87bfd07 100644 --- a/requests/auth.py +++ b/requests/auth.py @@ -108,13 +108,7 @@ def http_digest(r, username, password): r.request.send(anyway=True) _r = r.request.response _r.history.append(r) - print _r.status_code - # r.request.response - - print locals() - - print _r.headers return _r return r From 0008b035e2204ea7d1df5d62bd009e51df44aa17 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 23 Oct 2011 16:56:47 -0400 Subject: [PATCH 2/3] v0.7.3 --- HISTORY.rst | 6 ++++++ requests/__init__.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 6cb56628..1edef631 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,12 @@ History ------- +0.7.3 (2011-10-23) +++++++++++++++++++ + +* Digest Auth fix. + + 0.7.2 (2011-10-23) ++++++++++++++++++ diff --git a/requests/__init__.py b/requests/__init__.py index 5723dc44..fd8853d9 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -15,8 +15,8 @@ requests """ __title__ = 'requests' -__version__ = '0.7.2' -__build__ = 0x000702 +__version__ = '0.7.3' +__build__ = 0x000703 __author__ = 'Kenneth Reitz' __license__ = 'ISC' __copyright__ = 'Copyright 2011 Kenneth Reitz' From c108c5300fa1fb130d6121e5550a04b989e03fed Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 23 Oct 2011 17:18:39 -0400 Subject: [PATCH 3/3] No mo' HttpError --- requests/__init__.py | 2 +- requests/models.py | 7 ++++--- requests/sessions.py | 9 ++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/requests/__init__.py b/requests/__init__.py index fd8853d9..2d9fa113 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -23,7 +23,7 @@ __copyright__ = 'Copyright 2011 Kenneth Reitz' from . import utils -from .models import HTTPError, Request, Response +from .models import Request, Response from .api import request, get, head, post, patch, put, delete from .sessions import session from .status_codes import codes diff --git a/requests/models.py b/requests/models.py index 1fac1a8d..fd74ed54 100644 --- a/requests/models.py +++ b/requests/models.py @@ -12,21 +12,22 @@ import urllib2 import socket import zlib -from urllib2 import HTTPError from urlparse import urlparse, urlunparse, urljoin from datetime import datetime +from .auth import dispatch as auth_dispatch from .hooks import dispatch_hook from .structures import CaseInsensitiveDict from .packages.poster.encode import multipart_encode from .packages.poster.streaminghttp import register_openers, get_handlers -from .utils import (dict_from_cookiejar, get_unicode_from_response, stream_decode_response_unicode, decode_gzip, stream_decode_gzip) from .status_codes import codes from .exceptions import Timeout, URLRequired, TooManyRedirects from .monkeys import Request as _Request from .monkeys import HTTPRedirectHandler +from .utils import ( + dict_from_cookiejar, get_unicode_from_response, + stream_decode_response_unicode, decode_gzip, stream_decode_gzip) -from .auth import dispatch as auth_dispatch REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved) diff --git a/requests/sessions.py b/requests/sessions.py index 5993b27c..ee9dafab 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -51,7 +51,9 @@ def merge_kwargs(local_kwarg, default_kwarg): class Session(object): """A Requests session.""" - __attrs__ = ['headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks', 'params', 'config'] + __attrs__ = [ + 'headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks', + 'params', 'config'] def __init__(self, @@ -62,7 +64,8 @@ class Session(object): proxies=None, hooks=None, params=None, - config=None): + config=None, + keep_alive=True): self.headers = headers or {} self.cookies = cookies or {} @@ -72,6 +75,7 @@ class Session(object): self.hooks = hooks or {} self.params = params or {} self.config = config or {} + self.keep_alive = keep_alive for (k, v) in defaults.items(): self.config.setdefault(k, v) @@ -169,7 +173,6 @@ class Session(object): # Send the HTTP Request. r.send() - return r.response