# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1265632163 -3600
# Node ID 4f741341d96fe5f5554da6a488dc9f6994494395
# Parent  ee6362b4618d45e047e60d5997d73745288ac89b
avoid to see the same warning twice, one for 3.6 another for 3.3

diff -r ee6362b4618d -r 4f741341d96f web/formfields.py
--- 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,