[Erp5-report] r29648 - in /erp5/trunk/products/ERP5Type: Accessor/ tests/

[nobody at svn.erp5.org]

Author: jm
Date: Wed Oct 14 14:58:08 2009
New Revision: 29648

URL: http://svn.erp5.org?rev=29648&view=rev
Log:
Revert [29646] because list setters without List suffix are sometimes called with a list value

Modified:
    erp5/trunk/products/ERP5Type/Accessor/List.py
    erp5/trunk/products/ERP5Type/tests/testERP5Type.py

Modified: erp5/trunk/products/ERP5Type/Accessor/List.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Accessor/List.py?rev=29648&r1=29647&r2=29648&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Accessor/List.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Accessor/List.py [utf8] Wed Oct 14 14:58:08 2009
@@ -99,19 +99,7 @@
           value = map(self._item_cast, value)
         setattr(instance, self._storage_id, tuple(value))
 
-class Setter(DefaultSetter):
-
-    def __call__(self, instance, *args, **kw):
-      value = args[0]
-      # Modify the property
-      if value in self._null:
-        setattr(instance, self._storage_id, ())
-      elif self._is_tales_type:
-        setattr(instance, self._storage_id, str(value))
-      else:
-        if self._item_cast is not identity:
-          value = self._item_cast(value)
-        setattr(instance, self._storage_id, (value,))
+Setter = ListSetter
 
 class SetSetter(Base.Setter):
     """

Modified: erp5/trunk/products/ERP5Type/tests/testERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testERP5Type.py?rev=29648&r1=29647&r2=29648&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testERP5Type.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/testERP5Type.py [utf8] Wed Oct 14 14:58:08 2009
@@ -799,8 +799,8 @@
       person = module.newContent(portal_type='Person')
 
       # Do the same tests as in test_11_valueAccessor 
-      person.setSubject('beta gamma')
-      self.assertEquals(person.getSubject(), 'beta gamma')
+      person.setSubject('beta')
+      self.assertEquals(person.getSubject(), 'beta')
       person.setSubjectList(['alpha', 'alpha'])
       self.assertEquals(person.getSubjectList(), ['alpha', 'alpha'])
       self.assertEquals(person.getSubjectSet(), ['alpha'])