commit merge

2012-08-29 14:24:14 +02:00
parent f9afeb51f8
commit e5f9358cf9
75 changed files with 1546 additions and 2066 deletions
@@ -298,7 +298,7 @@ class CacheOnDisk(CacheAbstract):
            try:
                storage = self._open_shelf_with_lock()
                try:
-                    if not storage.has_key(CacheAbstract.cache_stats_name):
+                    if not CacheAbstract.cache_stats_name in storage:
                        storage[CacheAbstract.cache_stats_name] = {
                            'hit_total': 0,
                            'misses': 0,