innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Improved error messages when people use cache_page in undocumented and now unsupported ways. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2009-09-23 23:47:53 +00:00
parent 4a2a0b0e21
commit d6c2286712
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/views/decorators/cache.py
View File

@ -20,15 +20,20 @@ from django.utils.decorators import decorator_from_middleware_with_args, auto_ad
from django.utils.cache import patch_cache_control, add_never_cache_headers from django.utils.cache import patch_cache_control, add_never_cache_headers
from django.middleware.cache import CacheMiddleware from django.middleware.cache import CacheMiddleware
def cache_page(*args, **kwargs): def cache_page(*args):
# We need backwards compatibility with code which spells it this way: # We need backwards compatibility with code which spells it this way:
# def my_view(): pass # def my_view(): pass
# my_view = cache_page(123, my_view) # my_view = cache_page(123, my_view)
# and this way: # and this way:
# my_view = cache_page(123)(my_view) # my_view = cache_page(123)(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.
timeout = args[0] timeout = args[0]
if len(args) > 1: if len(args) > 1:
assert len(args) == 2, "cache_page accepts at most 2 arguments"
fn = args[1] fn = args[1]
assert callable(fn), "cache_page is expecting 2nd argument to be a callable"
return decorator_from_middleware_with_args(CacheMiddleware)(timeout)(fn) return decorator_from_middleware_with_args(CacheMiddleware)(timeout)(fn)
else: else:
return decorator_from_middleware_with_args(CacheMiddleware)(timeout) return decorator_from_middleware_with_args(CacheMiddleware)(timeout)