don't try to backup an already removed object

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

product/ERP5/Tool/TrashTool.py

@@ -77,6 +77,10 @@ class TrashTool(BaseTool):
         # export object
         object_path = container_path + [object_id]
         obj = self.unrestrictedTraverse(object_path)
+        if obj is None:
+          # object doesn't exist any longer
+          pass
+        else:
           copy = obj._p_jar.exportFile(obj._p_oid)
           # import object in trash
           connection = backup_object_container._p_jar
@@ -99,7 +103,9 @@ class TrashTool(BaseTool):
       if obj is None:
         object_path = container_path + [object_id]
         obj = self.unrestrictedTraverse(object_path)
-      if getattr(obj, 'meta_type', None) == 'ERP5 Type Information':
+      if obj is None:
+        pass
+      elif getattr(obj, 'meta_type', None) == 'ERP5 Type Information':
         subobjects_dict = {}
         subobjects_dict['allowed_content_type_list'] = getattr(obj, 'allowed_content_types', []) or []
         subobjects_dict['hidden_content_type_list'] = getattr(obj, 'hidden_content_type_list', []) or []
@@ -127,6 +133,9 @@ class TrashTool(BaseTool):
       else:
         object_path = container_path + [object_id]
         obj = self.unrestrictedTraverse(object_path)
+      if obj is None:
+        pass
+      else:
         for subobject_id in list(obj.objectIds()):
           subobject_path = object_path + [subobject_id]
           subobject = self.unrestrictedTraverse(subobject_path)
@@ -134,7 +143,6 @@ class TrashTool(BaseTool):
           subobjects_dict[subobject_id] = subobject_copy
           if save: # remove subobjecs from backup object
             obj.manage_delObjects([subobject_id])
-#     LOG('return subobject dict', 0, subobjects_dict)
     return subobjects_dict
 
   def newTrashBin(self, bt_title='trash', bt=None):