From 9763a671da1061244aa0a98e924efa1ec8379a7b Mon Sep 17 00:00:00 2001 From: Chase Sterling Date: Thu, 25 Apr 2013 22:34:51 -0400 Subject: [PATCH] Fix crash when session.cookies was not a RequestsCookieJar --- requests/sessions.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/requests/sessions.py b/requests/sessions.py index 40e4d82..1d3c555 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -9,6 +9,7 @@ requests (cookies, auth, proxies). """ import os +from copy import copy from datetime import datetime from .compat import cookielib @@ -285,8 +286,9 @@ class Session(SessionRedirectMixin): cookies = cookiejar_from_dict(cookies) # Merge with session cookies - merged_cookies = self.cookies.copy() - merged_cookies.update(cookies) + merged_cookies = copy(self.cookies) + for cookie in cookies: + merged_cookies.set_cookie(cookie) cookies = merged_cookies # Gather clues from the surrounding environment. -- 2.34.1