Ticket #15840: 15840.patch.2.diff

django/views/decorators/http.py

@@ -154 +154 @@
 
             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

tests/regressiontests/decorators/tests.py

@@ -6 +6 @@
 from django.utils.decorators import method_decorator
 from django.utils.functional import allow_lazy, lazy, memoize
 from django.utils.unittest import TestCase
-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, etag, last_modified
 from django.views.decorators.vary import vary_on_headers, vary_on_cookie
 from django.views.decorators.cache import cache_page, never_cache, cache_control
 
@@ -20 +20 @@
 fully_decorated = require_http_methods(["GET"])(fully_decorated)
 fully_decorated = require_GET(fully_decorated)
 fully_decorated = require_POST(fully_decorated)
+
+def last_modified_method(request):
+    return None
+
+def etag_method(request):
+    return None
+
+fully_decorated = condition(etag_func=etag_method, last_modified_func=last_modified_method)(fully_decorated)
+fully_decorated = etag(etag_method)(fully_decorated)
+fully_decorated = last_modified(last_modified_method)(fully_decorated)
+
 fully_decorated = require_safe(fully_decorated)
 
+def last_modified_method(request):
+    return None
+
+def etag_method(request):
+    return None
+
+fully_decorated = condition(etag_func=etag_method, last_modified_func=last_modified_method)(fully_decorated)
+fully_decorated = etag(etag_method)(fully_decorated)
+fully_decorated = last_modified(last_modified_method)(fully_decorated)
+
 # django.views.decorators.vary
 fully_decorated = vary_on_headers('Accept-language')(fully_decorated)
 fully_decorated = vary_on_cookie(fully_decorated)