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 feb617e2..05c9b82c 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/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 diff --git a/requests/models.py b/requests/models.py index f86d8048..35058911 100644 --- a/requests/models.py +++ b/requests/models.py @@ -15,15 +15,23 @@ from Cookie import SimpleCookie 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 .exceptions import Timeout, URLRequired, TooManyRedirects, RequestException, HTTPError +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 c90bd9aa..d35dbd21 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -52,7 +52,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, @@ -63,7 +65,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 {} @@ -73,6 +76,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) @@ -176,7 +180,6 @@ class Session(object): # Send the HTTP Request. r.send() - return r.response