[Erp5-report] r41703 nicolas - /erp5/trunk/products/ERP5/mixin/discoverable.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Dec 23 11:59:52 2010
New Revision: 41703

URL: http://svn.erp5.org?rev=41703&view=rev
Log:
Use more defensive code for discoverable features.
Ingestion must suceeds whatever encountered issues.

Done by JPS

Modified:
    erp5/trunk/products/ERP5/mixin/discoverable.py

Modified: erp5/trunk/products/ERP5/mixin/discoverable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/discoverable.py?rev=41703&r1=41702&r2=41703&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/discoverable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/discoverable.py [utf8] Thu Dec 23 11:59:52 2010
@@ -66,7 +66,9 @@ class DiscoverableMixin(CachedConvertabl
       user_login = str(getSecurityManager().getUser())
     method = self._getTypeBasedMethod('getPropertyDictFromUserLogin',
         fallback_script_id='Document_getPropertyDictFromUserLogin')
-    return method(user_login)
+    if method is not None:
+      return method(user_login)
+    return {}
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getPropertyDictFromContent')
@@ -82,7 +84,9 @@ class DiscoverableMixin(CachedConvertabl
       return {}
     method = self._getTypeBasedMethod('getPropertyDictFromContent',
         fallback_script_id='Document_getPropertyDictFromContent')
-    return method()
+    if method is not None:
+      return method()
+    return {}
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getPropertyDictFromFilename')
@@ -106,7 +110,9 @@ class DiscoverableMixin(CachedConvertabl
     to getPropertyDictFromInput.
     """
     method = self._getTypeBasedMethod('getPropertyDictFromInput')
-    return method(input_parameter_dict)
+    if method is not None:
+      return method(input_parameter_dict)
+    return {}
 
   ### Metadata disovery and ingestion methods
   security.declareProtected(Permissions.ModifyPortalContent,