Context Navigation

Ticket #15840: 15840.patch.3.diff

File 15840.patch.3.diff, 1.5 KB (added by Zbigniew Siciarz, 12 years ago)
Improved the patch so it applies cleanly to current trunk. Only the condition decorator needs testing, as the other two are implemented in terms of it.

diff --git a/django/views/decorators/http.py b/django/views/decorators/http.py
index 495a7b1..c282da5 100644

                def condition(etag_func=None, last_modified_func=None):
             return response
         return inner
+        return wraps(func, assigned=available_attrs(func))(inner)
     return decorator
 # Shortcut decorators for common cases based on ETag or Last-Modified only

diff --git a/tests/regressiontests/decorators/tests.py b/tests/regressiontests/decorators/tests.py
index 51f75d7..749df43 100644

                from django.utils.functional import allow_lazy, lazy, memoize
 from django.utils.unittest import TestCase
 from django.views.decorators.cache import cache_page, never_cache, cache_control
 from django.views.decorators.clickjacking import xframe_options_deny, xframe_options_sameorigin, xframe_options_exempt
 from django.views.decorators.http import require_http_methods, require_GET, require_POST, require_safe
+from django.views.decorators.http import require_http_methods, require_GET, require_POST, require_safe, condition
 from django.views.decorators.vary import vary_on_headers, vary_on_cookie
-…
+               full_decorator = compose(
     require_GET,
     require_POST,
     require_safe,
+    condition(lambda r: None, lambda r: None),
     # django.views.decorators.vary
     vary_on_headers('Accept-language'),