Address feedback from #1729

- Make the PreparedRequest's cookie jar an implementation detail
This commit is contained in:
Ian Cordasco
2013-12-04 06:45:18 -06:00
parent 8bfe0d873f
commit e8bdcdb0a7
3 changed files with 12 additions and 11 deletions
+2 -2
View File
@@ -170,8 +170,8 @@ class HTTPDigestAuth(AuthBase):
r.content
r.raw.release_conn()
prep = r.request.copy()
extract_cookies_to_jar(prep.cookies, r.request, r.raw)
prep.prepare_cookies(prep.cookies)
extract_cookies_to_jar(prep._cookies, r.request, r.raw)
prep.prepare_cookies(prep._cookies)
prep.headers['Authorization'] = self.build_digest_header(
prep.method, prep.url)
+7 -7
View File
@@ -270,9 +270,9 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
self.url = None
#: dictionary of HTTP headers.
self.headers = None
#: The `CookieJar` used to create the Cookie header will be stored here
#: after prepare_cookies is called
self.cookies = None
# The `CookieJar` used to create the Cookie header will be stored here
# after prepare_cookies is called
self._cookies = None
#: request body to send to the server.
self.body = None
#: dictionary of callback hooks, for internal usage.
@@ -302,7 +302,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
p.method = self.method
p.url = self.url
p.headers = self.headers.copy()
p.cookies = self.cookies.copy()
p._cookies = self._cookies.copy()
p.body = self.body
p.hooks = self.hooks
return p
@@ -478,11 +478,11 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
"""Prepares the given HTTP cookie data."""
if isinstance(cookies, cookielib.CookieJar):
self.cookies = cookies
self._cookies = cookies
else:
self.cookies = cookiejar_from_dict(cookies)
self._cookies = cookiejar_from_dict(cookies)
cookie_header = get_cookie_header(self.cookies, self)
cookie_header = get_cookie_header(self._cookies, self)
if cookie_header is not None:
self.headers['Cookie'] = cookie_header
+3 -2
View File
@@ -153,8 +153,9 @@ class SessionRedirectMixin(object):
except KeyError:
pass
extract_cookies_to_jar(prepared_request.cookies, prepared_request, resp.raw)
prepared_request.prepare_cookies(prepared_request.cookies)
extract_cookies_to_jar(prepared_request._cookies,
prepared_request, resp.raw)
prepared_request.prepare_cookies(prepared_request._cookies)
resp = self.send(
prepared_request,