Commits

Jason Moiron committed 90dafaa

protect django 1.1.4 from DB_CACHE_KEYS issues

Comments (0)

Files changed (1)

johnny/settings.py

 from warnings import warn
 
+import django
 from django.conf import settings
 from django.core.cache import get_cache, cache
 
             getattr(settings, 'JOHNNY_TABLE_BLACKLIST', []))
 BLACKLIST = set(BLACKLIST)
 
-DB_CACHE_KEYS = dict((name, db.get('JOHNNY_CACHE_KEY', name))
+# XXX: I've forgotten what JOHNNY_CACHE_KEY is exactly..
+if django.VERSION[1] >= 2:
+    DB_CACHE_KEYS = dict((name, db.get('JOHNNY_CACHE_KEY', name))
                      for name, db in settings.DATABASES.iteritems())
+else:
+    DB_CACHE_KEYS = {'default': 'default'}
 
 MIDDLEWARE_KEY_PREFIX = getattr(settings, 'JOHNNY_MIDDLEWARE_KEY_PREFIX', 'jc')
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.