diff --git a/product/ERP5SyncML/Conduit/ERP5Conduit.py b/product/ERP5SyncML/Conduit/ERP5Conduit.py index 605c661f46f7731ab557aa5939ad097bd9f3aed5..64023d5393a78855fe0b80ac7e278bea2660e697 100755 --- a/product/ERP5SyncML/Conduit/ERP5Conduit.py +++ b/product/ERP5SyncML/Conduit/ERP5Conduit.py @@ -142,7 +142,7 @@ class ERP5Conduit(XMLSyncUtilsMixin): if object_id is not None: try: subobject = object._getOb(object_id) - except (AttributeError, KeyError): + except (AttributeError, KeyError, TypeError): subobject = None if subobject is None: # If so, it doesn't exist portal_type = '' @@ -185,7 +185,7 @@ class ERP5Conduit(XMLSyncUtilsMixin): sub_object = None try: sub_object = object._getOb(sub_object_id) - except (AttributeError, KeyError): + except (AttributeError, KeyError, TypeError): pass if sub_object is not None: LOG('addNode',0,'subobject.id: %s' % sub_object.id) @@ -261,7 +261,7 @@ class ERP5Conduit(XMLSyncUtilsMixin): sub_xml = self.getSubObjectXupdate(xml) conflict_list += self.deleteNode(xml=sub_xml,object=sub_object, force=force, simulate=simulate, **kw) - except (KeyError, AttributeError): + except (KeyError, AttributeError, TypeError): LOG('ERP5Conduit',0,'deleteNode, Unable to delete SubObject: %s' % str(sub_object_id)) pass if object_id is not None: # We do have an object_id diff --git a/product/ERP5SyncML/Subscription.py b/product/ERP5SyncML/Subscription.py index 81d87c56f359fd786fae08b971b455099c582f81..c11aeabdbdef200451094eed4303309826f875f1 100755 --- a/product/ERP5SyncML/Subscription.py +++ b/product/ERP5SyncML/Subscription.py @@ -643,7 +643,7 @@ class Subscription(SyncCode, Implicit): o = None try: o = destination._getOb(o_id) - except (AttributeError, KeyError): + except (AttributeError, KeyError, TypeError): pass if o is not None and o in object_list: return o