              if cache_alias is None:
                  cache_alias = DEFAULT_CACHE_ALIAS
          except KeyError:
              cache_alias = settings.CACHE_MIDDLEWARE_ALIAS
              if cache_timeout is None:
                  cache_kwargs['TIMEOUT'] = settings.CACHE_MIDDLEWARE_SECONDS
              else:
 
</s> remove 
        cache_kwargs = {}
        try:
            key_prefix = kwargs.get('key_prefix')
            if key_prefix is not None:
                cache_kwargs['KEY_PREFIX'] = key_prefix
        except KeyError:
            cache_kwargs['KEY_PREFIX'] = settings.CACHE_MIDDLEWARE_KEY_PREFIX
 </s> add             if cache_timeout is None:
                cache_kwargs['TIMEOUT'] = settings.CACHE_MIDDLEWARE_SECONDS
            else:
                cache_kwargs['TIMEOUT'] = cache_timeout </s> remove             cache_key = get_cache_key(request, self.key_prefix, 'HEAD')
 </s> add             cache_key = get_cache_key(request, self.key_prefix, 'HEAD', cache=self.cache)
            if cache_timeout is not None:
                cache_kwargs['TIMEOUT'] = cache_timeout
              if cache_alias is None:
                  cache_alias = DEFAULT_CACHE_ALIAS
            if cache_timeout is not None:
                cache_kwargs['TIMEOUT'] = cache_timeout
          except KeyError:
              cache_alias = settings.CACHE_MIDDLEWARE_ALIAS
              if cache_timeout is None:
                  cache_kwargs['TIMEOUT'] = settings.CACHE_MIDDLEWARE_SECONDS
              else:
keep add keep keep keep keep keep
 Beefed up the tests for multi-cache handling of the cache middleware and view decorators, and made a couple of tweaks for edge cases as a result.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15021 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/middleware/cache.py