Removed DjangoMemcacheWrapper (#477)

Unused since Django 1.2

Author: vytisb

djcelery/backends/cache.py

@@ -3,8 +3,6 @@
 
 from datetime import timedelta
 
-import django
-from django.utils.encoding import smart_str
 from django.core.cache import cache, caches
 
 from celery import current_app
@@ -15,37 +13,6 @@
     cache = caches[current_app.conf.CELERY_CACHE_BACKEND]  # noqa
 
 
-class DjangoMemcacheWrapper(object):
-    """Wrapper class to django's memcache backend class, that overrides the
-    :meth:`get` method in order to remove the forcing of unicode strings
-    since it may cause binary or pickled data to break."""
-
-    def __init__(self, cache):
-        self.cache = cache
-
-    def get(self, key, default=None):
-        val = self.cache._cache.get(smart_str(key))
-        if val is None:
-            return default
-        else:
-            return val
-
-    def set(self, key, value, timeout=0):
-        self.cache.set(key, value, timeout)
-
-# Check if django is using memcache as the cache backend. If so, wrap the
-# cache object in a DjangoMemcacheWrapper for Django < 1.2 that fixes a bug
-# with retrieving pickled data.
-from django.core.cache.backends.base import InvalidCacheBackendError  # noqa
-try:
-    from django.core.cache.backends.memcached import CacheClass
-except (ImportError, AttributeError, InvalidCacheBackendError):
-    pass
-else:
-    if django.VERSION[0:2] < (1, 2) and isinstance(cache, CacheClass):
-        cache = DjangoMemcacheWrapper(cache)
-
-
 class CacheBackend(KeyValueStoreBackend):
     """Backend using the Django cache framework to store task metadata."""
 

djcelery/tests/test_backends/test_cache.py

@@ -5,7 +5,6 @@
 from datetime import timedelta
 
 from billiard.einfo import ExceptionInfo
-from django.core.cache.backends.base import InvalidCacheBackendError
 
 from celery import result
 from celery import states
@@ -114,34 +113,3 @@ def test_custom_cache_backend(self):
         finally:
             current_app.conf.CELERY_CACHE_BACKEND = prev_backend
             sys.modules['djcelery.backends.cache'] = prev_module
-
-
-class test_MemcacheWrapper(unittest.TestCase):
-
-    def test_memcache_wrapper(self):
-
-        try:
-            from django.core.cache.backends import memcached
-            from django.core.cache.backends import locmem
-        except InvalidCacheBackendError:
-            sys.stderr.write(
-                '\n* Memcache library is not installed. Skipping test.\n')
-            return
-        try:
-            prev_cache_cls = memcached.CacheClass
-            memcached.CacheClass = locmem.CacheClass
-        except AttributeError:
-            return
-        prev_backend_module = sys.modules.pop('djcelery.backends.cache')
-        try:
-            from djcelery.backends.cache import cache
-            key = 'cu.test_memcache_wrapper'
-            val = 'The quick brown fox.'
-            default = 'The lazy dog.'
-
-            self.assertEqual(cache.get(key, default=default), default)
-            cache.set(key, val)
-            self.assertEqual(cache.get(key, default=default), val)
-        finally:
-            memcached.CacheClass = prev_cache_cls
-            sys.modules['djcelery.backends.cache'] = prev_backend_module