test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected regressions introduced in r11586 and r11593 

I read the order of arguments in the docs incorrectly, doh!


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2009-09-26 19:39:42 +00:00
parent d6c2286712
commit a97648a7e0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,20 +23,24 @@ from django.middleware.cache import CacheMiddleware
def cache_page(*args): 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(my_view, 123)
# and this way: # and this way:
# my_view = cache_page(123)(my_view) # my_view = cache_page(123)(my_view)
# and possibly this way (?):
# my_view = cache_page(123, my_view)
# We also add some asserts to give better error messages in case people are # 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. # using other ways to call cache_page that no longer work.
timeout = args[0]
if len(args) > 1: if len(args) > 1:
assert len(args) == 2, "cache_page accepts at most 2 arguments" assert len(args) == 2, "cache_page accepts at most 2 arguments"
fn = args[1] if callable(args[0]):
assert callable(fn), "cache_page is expecting 2nd argument to be a callable" return decorator_from_middleware_with_args(CacheMiddleware)(args[1])(args[0])
return decorator_from_middleware_with_args(CacheMiddleware)(timeout)(fn) elif callable(args[1]):
return decorator_from_middleware_with_args(CacheMiddleware)(args[0])(args[1])
else:
assert False, "cache_page must be passed either a single argument (timeout) or a view function and a timeout"
else: else:
return decorator_from_middleware_with_args(CacheMiddleware)(timeout) return decorator_from_middleware_with_args(CacheMiddleware)(args[0])
def cache_control(**kwargs): def cache_control(**kwargs):

2
tests/regressiontests/decorators/tests.py
View File

@ -105,7 +105,7 @@ class DecoratorsTest(TestCase):
""" """
def my_view(request): def my_view(request):
return "response" return "response"
my_view_cached = cache_page(123, my_view) my_view_cached = cache_page(my_view, 123)
self.assertEqual(my_view_cached(HttpRequest()), "response") self.assertEqual(my_view_cached(HttpRequest()), "response")
class MethodDecoratorAdapterTests(TestCase): class MethodDecoratorAdapterTests(TestCase):