Skip to content

Commit aa82771

Browse files
author
carole
committed
fix (DEFAULT_TIMEOUT):
Django DEFAULT_TIMEOUT is an object, int value is required. - set DEFAULT_TIMEOUT value for the Django version 1.6.. - bump version
1 parent cb99f7d commit aa82771

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.coverage
22
.tox
3+
.idea/
34
docs/_build
45
*.py[co]
56
*.egg-info

caching/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from __future__ import unicode_literals
22

3-
VERSION = ('0', '9')
3+
VERSION = ('0', '9', '1')
44
__version__ = '.'.join(VERSION)

caching/compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
if django.VERSION[:2] >= (1, 6):
99
from django.core.cache.backends.base import DEFAULT_TIMEOUT as DJANGO_DEFAULT_TIMEOUT
10-
DEFAULT_TIMEOUT = DJANGO_DEFAULT_TIMEOUT
10+
DEFAULT_TIMEOUT = 300 if django.VERSION[:2] == (1, 6) else DJANGO_DEFAULT_TIMEOUT
1111
FOREVER = None
1212
else:
1313
DEFAULT_TIMEOUT = None

0 commit comments

Comments
 (0)