orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved the conversion thing into the ConfigAttribute.

Browse source
This commit is contained in:
Armin Ronacher 2011-09-25 19:17:50 +02:00
parent 6dccf77546
commit 8da8a21b69
3 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

42
flask/app.py
View file

@ -41,6 +41,12 @@ from .signals import request_started, request_finished, got_request_exception, \
_logger_lock = Lock()
def _make_timedelta(value):
if not isinstance(value, timedelta):
return timedelta(seconds=value)
return value
def setupmethod(f):
"""Wraps a method so that it performs a check in debug mode if the
first request was already handled.
@ -177,6 +183,16 @@ class Flask(_PackageBoundObject):
#: `SESSION_COOKIE_NAME` configuration key. Defaults to ``'session'``
session_cookie_name = ConfigAttribute('SESSION_COOKIE_NAME')
#: A :class:`~datetime.timedelta` which is used to set the expiration
#: date of a permanent session. The default is 31 days which makes a
#: permanent session survive for roughly one month.
#:
#: This attribute can also be configured from the config with the
#: `PERMANENT_SESSION_LIFETIME` configuration key. Defaults to
#: ``timedelta(days=31)``
permanent_session_lifetime = ConfigAttribute('PERMANENT_SESSION_LIFETIME',
get_converter=_make_timedelta)
#: Enable this if you want to use the X-Sendfile feature. Keep in
#: mind that the server has to support this. This only affects files
#: sent with the :func:`send_file` method.
@ -486,32 +502,6 @@ class Flask(_PackageBoundObject):
return rv
return self.debug
def _get_permanent_session_lifetime(self):
"""A :class:`~datetime.timedelta` which is used to set the expiration
date of a permanent session. The default is 31 days which makes a
permanent session survive for roughly one month.
This attribute can also be configured from the config with the
`PERMANENT_SESSION_LIFETIME` configuration key. Defaults to
``timedelta(days=31)``.
If you want to have this value as seconds you can use ``total_seconds()``::
app.permanent_session_lifetime.total_seconds()
Note that the config key can be a timedelta object or number of seconds
as integer since Flask 0.8.
"""
rv = self.config['PERMANENT_SESSION_LIFETIME']
if not isinstance(rv, timedelta):
return timedelta(seconds=rv)
return rv
def _set_permanent_session_lifetime(self, value):
self.config['PERMANENT_SESSION_LIFETIME'] = value
permanent_session_lifetime = property(_get_permanent_session_lifetime,
_set_permanent_session_lifetime)
del _get_permanent_session_lifetime, _set_permanent_session_lifetime
@property
def logger(self):
"""A :class:`logging.Logger` object for this application. The