Ticket #1738: cache.diff

django/core/cache/__init__.py

@@ -386 +386 @@
 #############
 
 import base64
-from django.core.db import db, DatabaseError
+from django.db import connection, DatabaseError
 from datetime import datetime
 
 class _DBCache(_Cache):
@@ -406 +406 @@
             self._cull_frequency = 3
 
     def get(self, key, default=None):
-        cursor = db.cursor()
+        cursor = connection.cursor()
         cursor.execute("SELECT cache_key, value, expires FROM %s WHERE cache_key = %%s" % self._table, [key])
         row = cursor.fetchone()
         if row is None:
@@ -414 +414 @@
         now = datetime.now()
         if row[2] < now:
             cursor.execute("DELETE FROM %s WHERE cache_key = %%s" % self._table, [key])
-            db.commit()
+            connection.commit()
             return default
         return pickle.loads(base64.decodestring(row[1]))
 
     def set(self, key, value, timeout=None):
         if timeout is None:
             timeout = self.default_timeout
-        cursor = db.cursor()
+        cursor = connection.cursor()
         cursor.execute("SELECT COUNT(*) FROM %s" % self._table)
         num = cursor.fetchone()[0]
         now = datetime.now().replace(microsecond=0)
@@ -439 +439 @@
             # To be threadsafe, updates/inserts are allowed to fail silently
             pass
         else:
-            db.commit()
+            connection.commit()
 
     def delete(self, key):
-        cursor = db.cursor()
+        cursor = connection.cursor()
         cursor.execute("DELETE FROM %s WHERE cache_key = %%s" % self._table, [key])
-        db.commit()
+        connection.commit()
 
     def has_key(self, key):
-        cursor = db.cursor()
+        cursor = connection.cursor()
         cursor.execute("SELECT cache_key FROM %s WHERE cache_key = %%s" % self._table, [key])
         return cursor.fetchone() is not None
 
@@ -498 +498 @@
 
     return _BACKENDS[scheme](host, params)
 
-from django.conf.settings import CACHE_BACKEND
-cache = get_cache(CACHE_BACKEND)
+from django.conf import settings
+cache = get_cache(settings.CACHE_BACKEND)