Moved vary decorators from django.utils.cache to django.views.decorators.vary

git-svn-id: http://code.djangoproject.com/svn/django/trunk@809 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/utils/cache.py

@@ -1,8 +1,8 @@
 """
-This module contains helper functions and decorators for controlling caching.
+This module contains helper functions for controlling caching. It does so by
-It does so by managing the "Vary" header of responses. It includes functions
+managing the "Vary" header of responses. It includes functions to patch the
-to patch the header of response objects directly and decorators that change
+header of response objects directly and decorators that change functions to do
-functions to do that header-patching themselves.
+that header-patching themselves.
 
 For information on the Vary header, see:
 
@@ -64,40 +64,6 @@ def patch_vary_headers(response, newheaders):
             vary.append(newheader)
     response['Vary'] = ', '.join(vary)
 
-def vary_on_headers(*headers):
-    """
-    A view decorator that adds the specified headers to the Vary header of the
-    response. Usage:
-
-       @vary_on_headers('Cookie', 'Accept-language')
-       def index(request):
-           ...
-
-    Note that the header names are not case-sensitive.
-    """
-    def decorator(func):
-        def inner_func(*args, **kwargs):
-            response = func(*args, **kwargs)
-            patch_vary_headers(response, headers)
-            return response
-        return inner_func
-    return decorator
-
-def vary_on_cookie(func):
-    """
-    A view decorator that adds "Cookie" to the Vary header of a response. This
-    indicates that a page's contents depends on cookies. Usage:
-
-        @vary_on_cookie
-        def index(request):
-            ...
-    """
-    def inner_func(*args, **kwargs):
-        response = func(*args, **kwargs)
-        patch_vary_headers(response, ('Cookie',))
-        return response
-    return inner_func
-
 def _generate_cache_key(request, headerlist, key_prefix):
     "Returns a cache key from the headers given in the header list."
     ctx = md5.new()

django/views/decorators/vary.py

@@ -0,0 +1,35 @@
+from django.utils.cache import patch_vary_headers
+
+def vary_on_headers(*headers):
+    """
+    A view decorator that adds the specified headers to the Vary header of the
+    response. Usage:
+
+       @vary_on_headers('Cookie', 'Accept-language')
+       def index(request):
+           ...
+
+    Note that the header names are not case-sensitive.
+    """
+    def decorator(func):
+        def inner_func(*args, **kwargs):
+            response = func(*args, **kwargs)
+            patch_vary_headers(response, headers)
+            return response
+        return inner_func
+    return decorator
+
+def vary_on_cookie(func):
+    """
+    A view decorator that adds "Cookie" to the Vary header of a response. This
+    indicates that a page's contents depends on cookies. Usage:
+
+        @vary_on_cookie
+        def index(request):
+            ...
+    """
+    def inner_func(*args, **kwargs):
+        response = func(*args, **kwargs)
+        patch_vary_headers(response, ('Cookie',))
+        return response
+    return inner_func