From 2b7b8dbbdbd6e0ee3e79d5281ad9b75cd47e7d5d Mon Sep 17 00:00:00 2001
From: Yoshinori Okuji <yo@nexedi.com>
Date: Sun, 16 Dec 2007 19:06:22 +0000
Subject: [PATCH] A little simplification.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18349 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Type/CachePlugins/RamCache.py | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/product/ERP5Type/CachePlugins/RamCache.py b/product/ERP5Type/CachePlugins/RamCache.py
index 0b693b52fa..1cad2ae723 100644
--- a/product/ERP5Type/CachePlugins/RamCache.py
+++ b/product/ERP5Type/CachePlugins/RamCache.py
@@ -68,20 +68,19 @@ class RamCache(BaseCache):
def get(self, cache_id, scope, default=None):
cache = self.getCacheStorage()
- if self.has_key(cache_id, scope):
- cache_entry = cache[scope].get(cache_id, default)
+ try:
+ cache_entry = cache[scope][cache_id]
cache_entry.markCacheHit()
self.markCacheHit()
return cache_entry
- else:
- return default
+ except KeyError:
+ pass
+ return default
def set(self, cache_id, scope, value, cache_duration=None, calculation_time=0):
cache = self.getCacheStorage()
- if not cache.has_key(scope):
- ## cache scope not initialized
- cache[scope] = {}
- cache[scope][cache_id] = CacheEntry(value, cache_duration, calculation_time)
+ slot = cache.setdefault(scope, {})
+ slot[cache_id] = CacheEntry(value, cache_duration, calculation_time)
self.markCacheMiss()
def expireOldCacheEntries(self, forceCheck = False):
@@ -103,10 +102,8 @@ class RamCache(BaseCache):
def has_key(self, cache_id, scope):
cache = self.getCacheStorage()
- if not cache.has_key(scope):
- ## cache scope not initialized
- cache[scope] = {}
- return cache[scope].has_key(cache_id)
+ slot = cache.setdefault(scope, {})
+ return slot.has_key(cache_id)
def getScopeList(self):
scope_list = []
--
2.30.9