From ca2a30f7ae266b4ad437e5ed24986b0ce45f67db Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 14 Sep 2016 10:53:24 +0200 Subject: [PATCH] Ignore not existent files on dbdict items --- src/Content/ContentDbDict.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Content/ContentDbDict.py b/src/Content/ContentDbDict.py index 78eeb452..39887c28 100644 --- a/src/Content/ContentDbDict.py +++ b/src/Content/ContentDbDict.py @@ -25,7 +25,7 @@ class ContentDbDict(dict): content = self.site.storage.loadJson(key) dict.__setitem__(self, key, content) except IOError: - dict.__delitem__(self, key) # File not exists anymore + self.__delitem__(key) # File not exists anymore raise KeyError(key) self.addCachedKey(key) @@ -81,13 +81,11 @@ class ContentDbDict(dict): def items(self): back = [] for key in dict.keys(self): - val = self[key] - if not val: - try: - val = self.loadItem(key) - except Exception: - self.log.error("Error loading %s: %s" % (key, err)) - continue + try: + val = self[key] + except Exception: + self.log.error("Error loading %s: %s" % (key, err)) + continue back.append((key, val)) return back