[Erp5-report] r31810 nicolas.dumazet - /erp5/trunk/products/ERP5Form/ListBox.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Tue Jan 19 09:57:56 2010
New Revision: 31810

URL: http://svn.erp5.org?rev=31810&view=rev
Log:
remove two useless tests

first case: obj is never modified between "obj = None" and this line
second case: (not tales) => (obj==None) 

Modified:
    erp5/trunk/products/ERP5Form/ListBox.py

Modified: erp5/trunk/products/ERP5Form/ListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ListBox.py?rev=31810&r1=31809&r2=31810&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py [utf8] Tue Jan 19 09:57:56 2010
@@ -2114,14 +2114,14 @@
         if editable_field is not None:
           tales = editable_field.tales.get('default', '')
           if tales:
-            if obj is None: obj = self.getObject()
+            obj = self.getObject()
             original_value = editable_field.__of__(obj).get_value('default',
                                                         cell=brain)
             processed_value = original_value
 
         # If a tales expression is not defined, get a skin, an accessor or a property.
         if not tales:
-          if (obj is None or brain is not obj) and getattr(aq_self(brain), alias, None) is not None:
+          if getattr(aq_self(brain), alias, None) is not None:
             original_value = getattr(brain, alias)
             processed_value = original_value
           else: