cybertools/media/piltransform.py

@@ -36,8 +36,8 @@ class PILTransform(object):
     def open(self, path):
         try:
             self.im = Image.open(path)
-        except IOError as e:
+        except (IOError, e):
-            logger.warning(e)
+            logger.warn(e)
             self.im = None
 
     def rotate(self, angle, resize):

cybertools/storage/filesystem.py

@@ -61,7 +61,7 @@ class FileSystemStorage(object):
             f.close()
             return data
         except IOError as e:
-            logger.warning(e)
+            logger.warn(e)
                         #'File %r cannot be read.' % fn)
             return ''
 

cybertools/tracking/btree.py

@@ -101,7 +101,7 @@ class Track(Persistent):
 class TrackingStorage(BTreeContainer):
 
     trackFactory = Track
-    #indexAttributes = trackFactory.index_attributes
+    indexAttributes = trackFactory.index_attributes
 
     trackNum = runId = 0
     runs = None             # currently active runs
@@ -109,19 +109,14 @@ class TrackingStorage(BTreeContainer):
     currentRuns = None      # the currently active run for each task
     storage = None          # compatibility with new cco.storage
 
-    @property
-    def indexAttributes(self):
-        return self.trackFactory.index_attributes
-
     def __init__(self, *args, **kw):
         trackFactory = kw.pop('trackFactory', None)
         if trackFactory is not None:
             self.trackFactory = trackFactory
-            #self.indexAttributes = trackFactory.index_attributes
+            self.indexAttributes = trackFactory.index_attributes
         super(TrackingStorage, self).__init__(*args, **kw)
         self.indexes = OOBTree.OOBTree()
-        #for idx in self.indexAttributes:
+        for idx in self.indexAttributes:
-        for idx in (trackFactory or self.trackFactory).index_attributes:
             self.indexes[idx] = FieldIndex()
         self.runs = IOBTree.IOBTree()
         self.finishedRuns = IOBTree.IOBTree()