Fix crash when session.cookies was not a RequestsCookieJar

zenyoul · Apr 26, 2013 · 9763a67 · 9763a67
1 parent 1866f75
commit 9763a67
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/requests/sessions.py b/requests/sessions.py
@@ -9,6 +9,7 @@
 
 """
 import os
+from copy import copy
 from datetime import datetime
 
 from .compat import cookielib
@@ -285,8 +286,9 @@ def request(self, method, url,
  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.