Mercurial Mercurial > pub > hg > cubicweb / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
web/formfields.py
changeset 4338 0eb7efcbcee1
parent 4304 0b53e850cdb5
child 4354 30f745305997 
--- a/web/formfields.py	Mon Jan 25 19:13:17 2010 +0100
+++ b/web/formfields.py	Mon Jan 25 19:16:35 2010 +0100
@@ -255,11 +255,18 @@
         assert self.choices is not None
         if callable(self.choices):
             try:
-                vocab = self.choices(form=form)
+                if getattr(self.choices, 'im_self', None) is self:
+                    vocab = self.choices(form=form)
+                else:
+                    vocab = self.choices(form=form, field=self)
             except TypeError:
-                warn('[3.3] vocabulary method (eg field.choices) should now take '
-                     'the form instance as argument', DeprecationWarning)
-                vocab = self.choices(req=form._cw)
+                warn('[3.6]  %s: choices should now take '
+                     'the form and field as named arguments', self)
+                try:
+                    vocab = self.choices(req=form._cw)
+                except TypeError:
+                    warn('[3.3]  %s: choices should now take '
+                         'the form and field as named arguments', self)
         else:
             vocab = self.choices
         if vocab and not isinstance(vocab[0], (list, tuple)):
cubicweb