diff options
| author | Bo Marchman <bo.marchman@gmail.com> | 2017-03-15 13:01:21 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-03-15 13:01:21 -0400 |
| commit | 7a7b331cd5975477597dac4dec7ee0ddb67f59e0 (patch) | |
| tree | aadc03f82abb0559cf3c2c7d1ac5b5fa0efd238c /django/templatetags | |
| parent | 44f9241c48e28823b140bc4ec7515f5a88b88c32 (diff) | |
Fixed #27882 -- Allowed {% cache %} to cache indefinitely.
Diffstat (limited to 'django/templatetags')
| -rw-r--r-- | django/templatetags/cache.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/django/templatetags/cache.py b/django/templatetags/cache.py index 3af6dc4df6..9e402a1206 100644 --- a/django/templatetags/cache.py +++ b/django/templatetags/cache.py @@ -20,10 +20,11 @@ class CacheNode(Node): expire_time = self.expire_time_var.resolve(context) except VariableDoesNotExist: raise TemplateSyntaxError('"cache" tag got an unknown variable: %r' % self.expire_time_var.var) - try: - expire_time = int(expire_time) - except (ValueError, TypeError): - raise TemplateSyntaxError('"cache" tag got a non-integer timeout value: %r' % expire_time) + if expire_time is not None: + try: + expire_time = int(expire_time) + except (ValueError, TypeError): + raise TemplateSyntaxError('"cache" tag got a non-integer timeout value: %r' % expire_time) if self.cache_name: try: cache_name = self.cache_name.resolve(context) |
