catch cookie errors that are prone to failure

diff --git a/requests/utils.py b/requests/utils.py
index 6ee227a0b1c4636845af9f07f0276f365e60e4c4..6952a996f551ca2252b2458d454d4b58f17097ce 100644 (file)
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -14,6 +14,7 @@ import codecs
 import os
 import random
 import re
+import traceback
 import zlib
 from netrc import netrc, NetrcParseError
 
@@ -61,11 +62,15 @@ def dict_from_string(s):
 
     cookies = dict()
 
-    c = SimpleCookie()
-    c.load(s)
+    try:
+        c = SimpleCookie()
+        c.load(s)
 
-    for k, v in list(c.items()):
-        cookies.update({k: v.value})
+        for k, v in list(c.items()):
+            cookies.update({k: v.value})
+    # This stuff is not to be trusted.
+    except Exception:
+        pass
 
     return cookies