Ignore not existent files on dbdict items

sirMackk · Sep 14, 2016 · ca2a30f · ca2a30f
1 parent 9fd19bf
commit ca2a30f
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Content/ContentDbDict.py b/src/Content/ContentDbDict.py
@@ -25,7 +25,7 @@ def loadItem(self, key):
             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 @@ def iteritems(self):
     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