summaryrefslogtreecommitdiff
path: root/macaroonbakery/httpbakery
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-08-20 17:53:46 +0100
committerColin Watson <cjwatson@debian.org>2018-08-20 17:54:31 +0100
commitf3d0400ea57884c6bd7f1d66352d3e44ad20e286 (patch)
tree9e826ffbdb7cb51825b67bd35a33de79ccb97356 /macaroonbakery/httpbakery
parentae33a39d857b367e216f1e80530c09087b108d16 (diff)
parent2105a515d749b74eef9a6bb6af008aa6a842e313 (diff)
Update upstream source from tag 'upstream/1.1.4'
Update to upstream version '1.1.4' with Debian dir 42ca954c317c7fd65bffdc0e0e6803556dccdf2f
Diffstat (limited to 'macaroonbakery/httpbakery')
-rw-r--r--macaroonbakery/httpbakery/_client.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/macaroonbakery/httpbakery/_client.py b/macaroonbakery/httpbakery/_client.py
index 4fe0ab1..2510f73 100644
--- a/macaroonbakery/httpbakery/_client.py
+++ b/macaroonbakery/httpbakery/_client.py
@@ -290,12 +290,8 @@ def _prepare_discharge_hook(req, client):
Retry.count)
)
client.handle_error(error, req.url)
- # Replace the private _cookies from req as it is a copy of
- # the original cookie jar passed into the requests method and we need
- # to set the cookie for this request.
- req._cookies = client.cookies
req.headers.pop('Cookie', None)
- req.prepare_cookies(req._cookies)
+ req.prepare_cookies(client.cookies)
req.headers[BAKERY_PROTOCOL_HEADER] = \
str(bakery.LATEST_VERSION)
with requests.Session() as s: