Do not use "getattr" to guess the folder type:

 - Object is wrapped in acquisition, so we can get attributes from its containers
 - Classes implemeting folder-ish objects *do* define those attributes with varying values (empty tuple on OFS.Folder, None on BTreeFolder, etc).
So the attribute presence must be grabbed from instance properties *only*.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16607 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Core/Folder.py

@@ -375,10 +375,7 @@ class CMFBTreeFolderHandler(FolderHandler):
     return getattr(CMFBTreeFolder, id)
 
   def isApplicable(self, folder):
-    result = False
-    if getattr(folder, '_tree', None) is not None:
-      result = True
-    return result
+    return '_tree' in getattr(folder, '__dict__', tuple())
 
 class CMFHBTreeFolderHandler(FolderHandler):
 
@@ -389,10 +386,7 @@ class CMFHBTreeFolderHandler(FolderHandler):
     return getattr(CMFHBTreeFolder, id)
 
   def isApplicable(self, folder):
-    result = False
-    if getattr(folder, '_htree', None) is not None:
-      result = True
-    return result
+    return '_htree' in getattr(folder, '__dict__', tuple())
 
 class OFSFolderHandler(FolderHandler):
 
@@ -403,10 +397,7 @@ class OFSFolderHandler(FolderHandler):
     return getattr(OFSFolder, id)
 
   def isApplicable(self, folder):
-    result = False
-    if getattr(folder, '_objects', None) is not None:
-      result = True
-    return result
+    return '_objects' in getattr(folder, '__dict__', tuple())
 
 global folder_handler_dict
 folder_handler_dict = {}