From de2996ddcc7c2ac5c3e59101df0fed1ab832701b Mon Sep 17 00:00:00 2001 From: Chris Rossi Date: Tue, 15 Jul 2014 10:57:36 -0400 Subject: Make sure it's possible to still set cache_max_age to None even if cache busting is being used. --- pyramid/config/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyramid/config/views.py b/pyramid/config/views.py index c09ddc73d..b583b59a0 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -1975,9 +1975,9 @@ class StaticURLInfo(object): else: # it's a view name url = None - cache_max_age = extra.pop('cache_max_age', None) - if cache_max_age is None and cb: - cache_max_age = 10 * 365 * 24 * 60 * 60 # Ten(ish) years + ten_years = 10 * 365 * 24 * 60 * 60 # more or less + default = ten_years if cb else None + cache_max_age = extra.pop('cache_max_age', default) # create a view view = static_view(spec, cache_max_age=cache_max_age, -- cgit v1.2.3