[Checkins] SVN: grok/trunk/src/grok/ Form action handlers don't get action anymore, just keyword

[Martijn Faassen]

Log message for revision 71370:
  Form action handlers don't get action anymore, just keyword 
  arguments with the data.

Changed:
  U   grok/trunk/src/grok/components.py
  U   grok/trunk/src/grok/formlib.py
  U   grok/trunk/src/grok/ftests/form/actions.py

-=-
Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py	2006-12-01 21:59:40 UTC (rev 71369)
+++ grok/trunk/src/grok/components.py	2006-12-01 22:08:57 UTC (rev 71370)
@@ -289,7 +289,7 @@
     label = ''
     status = ''
     
-    def applyChanges(self, action, data):
+    def applyChanges(self, **data):
         if form.applyChanges(self.context, self.form.form_fields, data,
                              self.form.adapters):
             event.notify(ObjectModifiedEvent(self.context))

Modified: grok/trunk/src/grok/formlib.py
===================================================================
--- grok/trunk/src/grok/formlib.py	2006-12-01 21:59:40 UTC (rev 71369)
+++ grok/trunk/src/grok/formlib.py	2006-12-01 22:08:57 UTC (rev 71370)
@@ -16,7 +16,7 @@
 class Action(form.Action):
     def success(self, data):
         if self.success_handler is not None:
-            return self.success_handler(self.form.grok_form, self, data)
+            return self.success_handler(self.form.grok_form, **data)
 
 def setup_editform(factory, context):
     """Construct the real edit form, taking needed information from factory.

Modified: grok/trunk/src/grok/ftests/form/actions.py
===================================================================
--- grok/trunk/src/grok/ftests/form/actions.py	2006-12-01 21:59:40 UTC (rev 71369)
+++ grok/trunk/src/grok/ftests/form/actions.py	2006-12-01 22:08:57 UTC (rev 71370)
@@ -41,10 +41,10 @@
 
 class Edit(grok.EditForm):
     @grok.action("Apply")
-    def handle_apply(self, action, data):
-        self.applyChanges(action, data)
+    def handle_apply(self, **data):
+        self.applyChanges(**data)
 
     @grok.action("Hairy")
-    def handle_hairy(self, action, data):
-        self.applyChanges(action, data)
+    def handle_hairy(self, **data):
+        self.applyChanges(**data)
         self.context.size += " and hairy"