diff --git a/django_pylibmc/memcached.py b/django_pylibmc/memcached.py index 0e2c72e..d4bf665 100644 --- a/django_pylibmc/memcached.py +++ b/django_pylibmc/memcached.py @@ -16,7 +16,7 @@ from django.conf import settings from django.core.cache.backends.base import InvalidCacheBackendError -from django.core.cache.backends.memcached import BaseMemcachedCache +from django.core.cache.backends.memcached import BaseMemcachedCache, DEFAULT_TIMEOUT try: import pylibmc @@ -24,11 +24,6 @@ except ImportError: raise InvalidCacheBackendError('Could not import pylibmc.') -try: - from django.core.cache.backends.memcached import DEFAULT_TIMEOUT -except ImportError: - DEFAULT_TIMEOUT = None - log = logging.getLogger('django.pylibmc') @@ -45,20 +40,12 @@ if not pylibmc.support_compression: warnings.warn('A compression level was provided but pylibmc was ' 'not compiled with support for it.') - if not pylibmc.__version__ >= '1.3.0': - warnings.warn('A compression level was provided but pylibmc 1.3.0 ' - 'or above is required to handle this option.') - # Keyword arguments to configure compression options -# based on capabilities of a provided pylibmc library. COMPRESS_KWARGS = { - # Requires pylibmc 1.0 and above. Given that the minumum supported - # version (as of now) is 1.1, the parameter is always included. 'min_compress_len': MIN_COMPRESS_LEN, + 'compress_level': COMPRESS_LEVEL, } -if pylibmc.__version__ >= '1.3.0': - COMPRESS_KWARGS['compress_level'] = COMPRESS_LEVEL class PyLibMCCache(BaseMemcachedCache):