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 4499 4f741341d96f
parent 4495 99c18d3f9542
child 4528 a51f37efc882 
--- a/web/formfields.py	Mon Feb 08 13:05:19 2010 +0100
+++ b/web/formfields.py	Mon Feb 08 13:29:23 2010 +0100
@@ -264,11 +264,11 @@
                 else:
                     vocab = self.choices(form=form, field=self, **kwargs)
             except TypeError:
-                warn('[3.6]  %s: choices should now take '
-                     'the form and field as named arguments' % self,
-                     DeprecationWarning)
                 try:
                     vocab = self.choices(form=form, **kwargs)
+                    warn('[3.6]  %s: choices should now take '
+                         'the form and field as named arguments' % self,
+                         DeprecationWarning)
                 except TypeError:
                     warn('[3.3]  %s: choices should now take '
                          'the form and field as named arguments' % self,
cubicweb