projects
/
platform
/
upstream
/
python-requests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3984156
)
cookies: Replace type checks with try/except
author
Michael Becker
<mike@beckerfuffle.com>
Tue, 3 Dec 2013 03:15:01 +0000
(22:15 -0500)
committer
Michael Becker
<mike@beckerfuffle.com>
Fri, 6 Dec 2013 13:56:30 +0000
(08:56 -0500)
requests/cookies.py
patch
|
blob
|
history
diff --git
a/requests/cookies.py
b/requests/cookies.py
index
c465f55
..
29b60f8
100644
(file)
--- a/
requests/cookies.py
+++ b/
requests/cookies.py
@@
-383,9
+383,11
@@
def morsel_to_cookie(morsel):
expires = time.time() + morsel["max-age"]
elif morsel['expires']:
expires = morsel['expires']
-
if type(expires) == type("")
:
+
try
:
time_template = "%a, %d-%b-%Y %H:%M:%S GMT"
expires = time.mktime(time.strptime(expires, time_template))
+ except TypeError:
+ pass
c = create_cookie(
name=morsel.key,
value=morsel.value,