dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expires can be str or datetime

Browse Source
This commit is contained in:
mdipierro
2013-09-19 18:03:35 -05:00
parent 1d2fc4b8f5
commit d125b0b95b
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
Version 2.6.3-stable+timestamp.2013.09.19.17.46.36
Version 2.6.3-stable+timestamp.2013.09.19.18.02.19

17
gluon/globals.py
View File

@@ -939,12 +939,11 @@ class Session(Storage):
if response.session_id:
rcookies[response.session_id_name] = response.session_id
rcookies[response.session_id_name]['path'] = '/'
if isinstance(response.session_cookie_expires,datetime.datetime):
rcookies[response.session_id_name]['expires'] = \
response.session_cookie_expires.strftime(FMT)
elif isinstance(response.session_cookie_expires,str):
rcookies[response.session_id_name]['expires'] = \
response.session_cookie_expires
expires = response.session_cookie_expires
if isinstance(expires,datetime.datetime):
expires = expires.strftime(FMT)
if expires:
rcookies[response.session_id_name]['expires'] = expires
def clear(self):
Storage.clear(self)
@@ -981,13 +980,15 @@ class Session(Storage):
value = secure_dumps(dict(self),
response.session_cookie_key,
compression_level=compression_level)
expires = response.session_cookie_expires
rcookies = response.cookies
rcookies.pop(name, None)
rcookies[name] = value
rcookies[name]['path'] = '/'
expires = response.session_cookie_expires
if isinstance(expires,datetime.datetime):
expires = expires.strftime(FMT)
if expires:
rcookies[name]['expires'] = expires.strftime(FMT)
rcookies[name]['expires'] = expires
return True
def _unchanged(self,response):