Merge ea0f7a9 into 9b3c271

respondcreate · Jul 8, 2015 · 1a203ec · 1a203ec
2 parents 9b3c271 + ea0f7a9
commit 1a203ec
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/versatileimagefield/settings.py b/versatileimagefield/settings.py
@@ -3,9 +3,14 @@
 from django.conf import settings
 from django.core.cache import (
     cache as default_cache,
-    get_cache,
     InvalidCacheBackendError
 )
+# Beginning with Django 1.7 'get_cache' is deprecated in favor of 'caches'
+# and will be dropped in Django 1.9
+try:
+    from django.core.cache import caches
+except ImportError:
+    from django.core.cache import get_cache as caches
 
 # Defaults
 QUAL = 70
@@ -59,7 +64,7 @@
 )
 
 try:
-    cache = get_cache(VERSATILEIMAGEFIELD_CACHE_NAME)
+    cache = caches(VERSATILEIMAGEFIELD_CACHE_NAME)
 except InvalidCacheBackendError:
     cache = default_cache