Ticket #3445: 3445.diff

django/

@@ -1 +1 @@
 from django.conf import settings
-from django.core.cache import cache
-from django.utils.cache import get_cache_key, learn_cache_key, patch_response_headers
+from django.cache import cache
+from django.cache.utils import get_cache_key, learn_cache_key, patch_response_headers
 
 class CacheMiddleware(object):
     """

django/

@@ -13 +13 @@
 different header content for headers named in "Vary" need to get different
 cache keys to prevent delivery of wrong content.
 
-A example: i18n middleware would need to distinguish caches by the
+An example: i18n middleware would need to distinguish caches by the
 "Accept-language" header.
 """
 
 import datetime, md5, re
 from django.conf import settings
-from django.core.cache import cache
+from django.cache import cache
 
 cc_delim_re = re.compile(r'\s*,\s*')
 
@@ -116 +116 @@
         value = request.META.get(header, None)
         if value is not None:
             ctx.update(value)
-    return 'views.decorators.cache.cache_page.%s.%s.%s' % (key_prefix, request.path, ctx.hexdigest())
+    return 'cache.decorators.cache_page.%s.%s.%s' % (key_prefix, request.path, ctx.hexdigest())
 
 def get_cache_key(request, key_prefix=None):
     """
@@ -130 +130 @@
     """
     if key_prefix is None:
         key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
-    cache_key = 'views.decorators.cache.cache_header.%s.%s' % (key_prefix, request.path)
+    cache_key = 'cache.decorators.cache_header.%s.%s' % (key_prefix, request.path)
     headerlist = cache.get(cache_key, None)
     if headerlist is not None:
         return _generate_cache_key(request, headerlist, key_prefix)
@@ -154 +154 @@
         key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
     if cache_timeout is None:
         cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
-    cache_key = 'views.decorators.cache.cache_header.%s.%s' % (key_prefix, request.path)
+    cache_key = 'cache.decorators.cache_header.%s.%s' % (key_prefix, request.path)
     if response.has_header('Vary'):
         headerlist = ['HTTP_'+header.upper().replace('-', '_') for header in vary_delim_re.split(response['Vary'])]
         cache.set(cache_key, headerlist, cache_timeout)

django/

@@ -12 +12 @@
 """
 
 from django.utils.decorators import decorator_from_middleware
-from django.utils.cache import patch_cache_control, add_never_cache_headers
-from django.middleware.cache import CacheMiddleware
+from django.cache.utils import patch_cache_control, add_never_cache_headers
+from django.cache.middleware import CacheMiddleware
 
 cache_page = decorator_from_middleware(CacheMiddleware)
 

cache/__init__.py

@@ -4 +4 @@
 This package defines set of cache backends that all conform to a simple API.
 In a nutshell, a cache is a set of values -- which can be any object that
 may be pickled -- identified by string keys.  For the complete API, see
-the abstract BaseCache class in django.core.cache.backends.base.
+the abstract BaseCache class in django.cache.backends.base.
 
 Client code should not access a cache backend directly; instead it should
 either use the "cache" variable made available here, or it should use the
@@ -17 +17 @@
 
 from cgi import parse_qsl
 from django.conf import settings
-from django.core.cache.backends.base import InvalidCacheBackendError
+from django.cache.backends.base import InvalidCacheBackendError
 
 BACKENDS = {
     # name for use in settings file --> name of module in "backends" directory
@@ -48 +48 @@
     if host.endswith('/'):
         host = host[:-1]
 
-    cache_class = getattr(__import__('django.core.cache.backends.%s' % BACKENDS[scheme], {}, {}, ['']), 'CacheClass')
+    cache_class = getattr(__import__('django.cache.backends.%s' % BACKENDS[scheme], {}, {}, ['']), 'CacheClass')
     return cache_class(host, params)
 
 cache = get_cache(settings.CACHE_BACKEND)

cache/backends/db.py

@@ -1 +1 @@
 "Database cache backend."
 
-from django.core.cache.backends.base import BaseCache
+from django.cache.backends.base import BaseCache
 from django.db import connection, transaction, DatabaseError
 import base64, time
 from datetime import datetime

cache/backends/dummy.py

@@ -1 +1 @@
 "Dummy cache backend"
 
-from django.core.cache.backends.base import BaseCache
+from django.cache.backends.base import BaseCache
 
 class CacheClass(BaseCache):
     def __init__(self, *args, **kwargs):

cache/backends/filebased.py

@@ -1 +1 @@
 "File-based cache backend"
 
-from django.core.cache.backends.simple import CacheClass as SimpleCacheClass
+from django.cache.backends.simple import CacheClass as SimpleCacheClass
 import os, time, urllib
 try:
     import cPickle as pickle

cache/backends/locmem.py

@@ -1 +1 @@
 "Thread-safe in-memory cache backend."
 
-from django.core.cache.backends.simple import CacheClass as SimpleCacheClass
+from django.cache.backends.simple import CacheClass as SimpleCacheClass
 from django.utils.synch import RWLock
 import copy, time
 

cache/backends/memcached.py

@@ -1 +1 @@
 "Memcached cache backend"
 
-from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError
+from django.cache.backends.base import BaseCache, InvalidCacheBackendError
 
 try:
     import cmemcache as memcache

cache/backends/simple.py

@@ -1 +1 @@
 "Single-process in-memory cache backend."
 
-from django.core.cache.backends.base import BaseCache
+from django.cache.backends.base import BaseCache
 import time
 
 class CacheClass(BaseCache):

django/conf/global_settings.py

@@ -273 +273 @@
 # CACHE #
 #########
 
-# The cache backend to use.  See the docstring in django.core.cache for the
+# The cache backend to use.  See the docstring in django.cache for the
 # possible values.
 CACHE_BACKEND = 'simple://'
 CACHE_MIDDLEWARE_KEY_PREFIX = ''

django/contrib/admin/views/main.py

@@ -2 +2 @@
 from django.conf import settings
 from django.contrib.admin.filterspecs import FilterSpec
 from django.contrib.admin.views.decorators import staff_member_required
-from django.views.decorators.cache import never_cache
+from django.cache.decorators import never_cache
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
 from django.core.paginator import ObjectPaginator, InvalidPage

django/contrib/sessions/middleware.py

@@ -1 +1 @@
 from django.conf import settings
 from django.contrib.sessions.models import Session
 from django.core.exceptions import SuspiciousOperation
-from django.utils.cache import patch_vary_headers
+from django.cache.utils import patch_vary_headers
 import datetime
 
 TEST_COOKIE_NAME = 'testcookie'

django/middleware/gzip.py

@@ -1 +1 @@
 import re
 from django.utils.text import compress_string
-from django.utils.cache import patch_vary_headers
+from django.cache.utils import patch_vary_headers
 
 re_accepts_gzip = re.compile(r'\bgzip\b')
 

django/middleware/locale.py

@@ -1 +1 @@
 "this is the locale selecting middleware that will look at accept headers"
 
-from django.utils.cache import patch_vary_headers
+from django.cache.utils import patch_vary_headers
 from django.utils import translation
 
 class LocaleMiddleware(object):

django/views/decorators/vary.py

@@ -1 @@
-from django.utils.cache import patch_vary_headers
+from django.cache.utils import patch_vary_headers
 
 def vary_on_headers(*headers):
     """

docs/cache.txt

@@ -294 +294 @@
 intensive database query. In cases like this, you can use the low-level cache
 API to store objects in the cache with any level of granularity you like.
 
-The cache API is simple. The cache module, ``django.core.cache``, exports a
+The cache API is simple. The cache module, ``django.cache``, exports a
 ``cache`` object that's automatically created from the ``CACHE_BACKEND``
 setting::
 
-    >>> from django.core.cache import cache
+    >>> from django.cache import cache
 
 The basic interface is ``set(key, value, timeout_seconds)`` and ``get(key)``::
 

tests/regressiontests/cache/tests.py

@@ -1 +1 @@
 # Unit tests for cache framework
 # Uses whatever cache backend is set in the test settings file.
 
-from django.core.cache import cache
+from django.cache import cache
 import time, unittest
 
 # functions/classes for complex data type tests