Robert Brewer avatar Robert Brewer committed 6f09ab7

Fix for #714 (bug in tools.caching). Also tweaked MemoryCache.key to be faster when tools.caching.key is set.

Comments (0)

Files changed (1)

cherrypy/lib/caching.py

 from cherrypy.lib import cptools, http
 
 
+_missing = object()
+
+
 class MemoryCache:
     
     def __init__(self):
     
     def _key(self):
         request = cherrypy.request
-        return request.config.get("tools.caching.key", cherrypy.url(qs=request.query_string))
+        key = request.config.get("tools.caching.key", _missing)
+        if key is _missing:
+            key = cherrypy.url(qs=request.query_string)
+        return key
     key = property(_key)
     
     def expire_cache(self):
                 self.cursize = total_size
     
     def delete(self):
-        self.cache.pop(self.key)
+        self.cache.pop(self.key, None)
 
 
 def get(invalid_methods=("POST", "PUT", "DELETE"), cache_class=MemoryCache, **kwargs):
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.