Ticket #17286: 17286.diff

django/core/cache/__init__.py

@@ -176 +176 @@
     except (AttributeError, ImportError), e:
         raise InvalidCacheBackendError(
             "Could not find backend '%s': %s" % (backend, e))
-    return backend_cls(location, params)
+    cache = backend_cls(location, params)
+    # Some caches -- python-memcached in particular -- need to do a cleanup at the
+    # end of a request cycle. If the cache provides a close() method, wire it up
+    # here.
+    if hasattr(cache, 'close'):
+        signals.request_finished.connect(cache.close)
+    return cache
 
 cache = get_cache(DEFAULT_CACHE_ALIAS)
 
-# Some caches -- python-memcached in particular -- need to do a cleanup at the
-# end of a request cycle. If the cache provides a close() method, wire it up
-# here.
-if hasattr(cache, 'close'):
-    signals.request_finished.connect(cache.close)

new file tests/regressiontests/cache/closeable_cache.py

@@ +1 @@
+from django.core.cache.backends.locmem import LocMemCache
+
+
+class CloseHookMixin(object):
+    closed = False
+
+    def close(self, **kwargs):
+        self.closed = True
+
+class CacheClass(CloseHookMixin, LocMemCache):
+    pass

tests/regressiontests/cache/tests.py

@@ -1040 +1040 @@
 
         self.assertRaises(InvalidCacheBackendError, get_cache, 'does_not_exist')
 
+    def test_close(self):
+        from django.core import signals
+        cache = get_cache('regressiontests.cache.closeable_cache.CacheClass')
+        self.assertFalse(cache.closed)
+        signals.request_finished.send(self.__class__)
+        self.assertTrue(cache.closed)
+
 
 class CacheUtils(TestCase):
     """TestCase for django.utils.cache functions."""