Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Python 2.6 support #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Python 2.6 support #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75313bb
Python 2.6 fix for `timedelta.total_seconds`
justinfay Apr 15, 2015
6aaf169
Add Python2.6 to tox and travis
justinfay Apr 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: python
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py33
install: pip install tox
Expand Down
7 changes: 6 additions & 1 deletion flask_kvsession/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,12 @@ def save_session(self, app, session, response):

if getattr(store, 'ttl_support', False):
# TTL is supported
ttl = current_app.permanent_session_lifetime.total_seconds()
try:
ttl = current_app.permanent_session_lifetime.total_seconds()
except AttributeError:
# Python 2.6 support
delta = current_app.permanent_session_lifetime
ttl = delta.seconds + delta.days * 24 * 3600
store.put(session.sid_s, data, ttl)
else:
store.put(session.sid_s, data)
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py33
envlist = py26,py27,py33

[testenv]
deps=
Expand Down