From 0cd23d8d6e9fee70e4cc51c37e0b6a111411f2c0 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Thu, 28 Mar 2013 08:33:34 -0400 Subject: [PATCH] Fix the tests and unseparate comments from code See the comments on the previous few commits on GitHub. --- requests/models.py | 2 +- requests/sessions.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requests/models.py b/requests/models.py index 14518006..6ed2b599 100644 --- a/requests/models.py +++ b/requests/models.py @@ -394,7 +394,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): elif body is not None: l = super_len(body) if l: - self.headers['Content-Length'] = super_len(l) + self.headers['Content-Length'] = str(l) elif self.method not in ('GET', 'HEAD'): self.headers['Content-Length'] = '0' diff --git a/requests/sessions.py b/requests/sessions.py index 26131fc5..961fc3bc 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -429,12 +429,14 @@ class Session(SessionRedirectMixin): def send(self, request, **kwargs): """Send a given PreparedRequest.""" - # It's possible that users might accidentally send a Request object. - # Guard against that specific failure case. + # Set defaults that the hooks can utilize to ensure they always have + # the correct parameters to reproduce the previous request. kwargs.setdefault('stream', False) kwargs.setdefault('verify', True) kwargs.setdefault('proxies', {}) + # It's possible that users might accidentally send a Request object. + # Guard against that specific failure case. if getattr(request, 'prepare', None): raise ValueError('You can only send PreparedRequests.')