[Erp5-report] r33775 nicolas.dumazet - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Wed Mar 17 07:09:21 2010
New Revision: 33775

URL: http://svn.erp5.org?rev=33775&view=rev
Log:
Take care of backwards compatibility, even if the previous behaviour was wrong

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

Modified: erp5/trunk/products/ERP5/Document/TransformedResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformedResource.py?rev=33775&r1=33774&r2=33775&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformedResource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformedResource.py [utf8] Wed Mar 17 07:09:21 2010
@@ -29,6 +29,7 @@
 ##############################################################################
 import zope.interface
 
+from warnings import warn
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
@@ -268,8 +269,17 @@
         context_quantity = None
         quantity_getter = getattr(context, "getQuantity", None)
         if quantity_getter is not None:
-          context_quantity = quantity_getter()
-        if context_quantity is None:
+          _marker = object()
+          context_quantity = quantity_getter(_marker)
+          if context_quantity is _marker:
+            # XXX Backwards compatibility:
+            # previously, quantity property of the Amount was completely
+            # ignored, and was assumed to be 1.0 . Re-enact this old
+            # behavior (quantity default value is 0.0) to avoid breakages
+            warn("No quantity was defined on the Amount passed to " \
+                 "getAggregatedAmountList, 1.0 was assumed", DeprecationWarning)
+            context_quantity = 1.0
+        else:
           raise KeyError("No quantity defined on context")
         quantity *= float(context_quantity)