Ticket #12019: cache_page_default_timeout.diff

django/views/decorators/cache.py

@@ -33 +33 @@
     #   my_view = cache_page(123, key_prefix="foo")(my_view)
     # and possibly this way (?):
     #   my_view = cache_page(123, my_view)
+    # and also this way (timeout defaults to CACHE_MIDDLEWARE_SECONDS)
+    #   my_view = cache_page(my_view) 
 
     # We also add some asserts to give better error messages in case people are
     # using other ways to call cache_page that no longer work.
@@ -46 +48 @@
             return decorator_from_middleware_with_args(CacheMiddleware)(cache_timeout=args[0], key_prefix=key_prefix)(args[1])
         else:
             assert False, "cache_page must be passed either a single argument (timeout) or a view function and a timeout"
+    elif callable(args[0]):
+        return decorator_from_middleware_with_args(CacheMiddleware)(key_prefix=key_prefix)(args[0])
     else:
         return decorator_from_middleware_with_args(CacheMiddleware)(cache_timeout=args[0], key_prefix=key_prefix)
 

tests/regressiontests/decorators/tests.py

@@ -112 +112 @@
         self.assertEqual(my_view_cached(HttpRequest()), "response")
         my_view_cached2 = cache_page(my_view, 123, key_prefix="test")
         self.assertEqual(my_view_cached2(HttpRequest()), "response")
+        my_view_cached3 = cache_page(my_view)
+        self.assertEqual(my_view_cached3(HttpRequest()), "response")
 
 
 # For testing method_decorator, a decorator that assumes a single argument.