[Checkins] SVN: megrok.z3cform.base/trunk/src/megrok/z3cform/base/ Fixed both typos and tests.

[Souheil CHELFOUH]

Log message for revision 104851:
  Fixed both typos and tests.

Changed:
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_utils.py
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/utils.py

-=-
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_utils.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_utils.py	2009-10-07 11:04:15 UTC (rev 104850)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_utils.py	2009-10-07 11:08:44 UTC (rev 104851)
@@ -4,19 +4,15 @@
   True
   >>> changes = set_fields_data(Fields(IPerson), person, {'name': u'james'})
   >>> changes
+  {<InterfaceClass megrok.z3cform.base.tests.test_utils.IPerson>: ['name']}
+ 
   
-  >>> from zope.event import notify
-  >>> from zope.lifecycleevent import Attributes
-  >>> notify(ObjectModifiedEvent(person, *[Attributes(IPerson, 'name')]))
-  An IObjectModifiedEvent was sent for a person with the following changes:
-  name  
-  
 """
 import grokcore.component as grok
 from zope.schema import TextLine
 from zope.interface import Interface
 from zope.lifecycleevent import ObjectModifiedEvent
-from from z3c.form.field import Fields
+from z3c.form.field import Fields
 from megrok.z3cform.base.utils import *
 
 class IPerson(Interface):

Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/utils.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/utils.py	2009-10-07 11:04:15 UTC (rev 104850)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/utils.py	2009-10-07 11:08:44 UTC (rev 104851)
@@ -3,7 +3,8 @@
 from zope.event import notify
 from z3c.form import interfaces
 from zope.event import notify
-from zope.schema import IObject
+from zope.component import getMultiAdapter
+from zope.schema.interfaces import IObject
 from zope.lifecycleevent import Attributes, ObjectModifiedEvent
 
 
@@ -18,10 +19,9 @@
 
         if name not in data or data[name] is interfaces.NOT_CHANGED:
             continue
+
+        dm = getMultiAdapter((content, field.field), interfaces.IDataManager)
  
-        dm = zope.component.getMultiAdapter(
-            (content, field.field), interfaces.IDataManager)
- 
         if dm.get() != data[name] or IObject.providedBy(field.field):
             dm.set(data[name])
             changes.setdefault(dm.field.interface, []).append(name)