# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1288979285 -3600
# Node ID 7d68948015ba508124e3fc16f573c61a2ff4f9e8
# Parent  51ddb4842c567fe075972d5c647b26ffb62156eb
[forms] remove some deprecation warnings

diff -r 51ddb4842c56 -r 7d68948015ba web/formfields.py
--- a/web/formfields.py	Fri Nov 05 17:00:41 2010 +0100
+++ b/web/formfields.py	Fri Nov 05 18:48:05 2010 +0100
@@ -428,7 +428,9 @@
                 vocab[i] = option
         return vocab
 
-    def format(self, form):
+    # support field as argument to avoid warning when used as format field value
+    # callback
+    def format(self, form, field=None):
         """return MIME type used for the given (text or bytes) field"""
         if self.eidparam and self.role == 'subject':
             entity = form.edited_entity
diff -r 51ddb4842c56 -r 7d68948015ba web/views/workflow.py
--- a/web/views/workflow.py	Fri Nov 05 17:00:41 2010 +0100
+++ b/web/views/workflow.py	Fri Nov 05 18:48:05 2010 +0100
@@ -104,7 +104,7 @@
             'st1': entity.cw_adapt_to('IWorkflowable').printable_state,
             'st2': self._cw._(transition.destination(entity).name)}
         self.w(u'<p>%s</p>\n' % msg)
-        self.w(form.render())
+        form.render(w=self.w)
 
     def redirectpath(self, entity):
         return entity.rest_path()