[Erp5-report] r39890 kazuhiko - /erp5/trunk/products/ERP5/Document/Document.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov  4 11:03:57 2010
New Revision: 39890

URL: http://svn.erp5.org?rev=39890&view=rev
Log:
* we no longer use ExtensibleTraversableMixIn directly here.
* fix wrong usages of except.

Modified:
    erp5/trunk/products/ERP5/Document/Document.py

Modified: erp5/trunk/products/ERP5/Document/Document.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Document.py?rev=39890&r1=39889&r2=39890&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Document.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Document.py [utf8] Thu Nov  4 11:03:57 2010
@@ -42,7 +42,6 @@ from Products.ERP5Type.DateUtils import 
                                 number_of_hours_in_day, number_of_hours_in_year
 from Products.ERP5Type.Utils import convertToUpperCase, fill_args_from_request
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
-from Products.ERP5Type.ExtensibleTraversable import ExtensibleTraversableMixIn
 from Products.ERP5Type.Cache import getReadOnlyTransactionCache
 from Products.ERP5.Document.Url import UrlMixIn
 from Products.ERP5.Tool.ContributionTool import MAX_REPEAT
@@ -892,7 +891,7 @@ class Document(DocumentExtensibleTravers
     """
     try:
       method = self._getTypeBasedMethod('getMetadataMappingDict')
-    except KeyError, AttributeError:
+    except (KeyError, AttributeError):
       method = None
     if method is not None:
       return method()
@@ -915,7 +914,7 @@ class Document(DocumentExtensibleTravers
     """
     try:
       method = self._getTypeBasedMethod('populateContent')
-    except KeyError, AttributeError:
+    except (KeyError, AttributeError):
       method = None
     if method is not None: method()