# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1278930319 -7200
# Node ID 67dfe437bf25b85190ccbe5d50b35b5a6ee30fa8
# Parent  af48c527aea75c8a18f8fbbcee2e86658c8791c7
[form] take care to not unicodify None values

diff -r af48c527aea7 -r 67dfe437bf25 web/formfields.py
--- a/web/formfields.py	Fri Jul 09 12:48:03 2010 +0200
+++ b/web/formfields.py	Mon Jul 12 12:25:19 2010 +0200
@@ -411,7 +411,7 @@
             vocab = vocab_sort(vocab)
         # XXX pre 3.9 bw compat
         for i, (label, value) in enumerate(vocab):
-            if not isinstance(value, basestring):
+            if value is not None and not isinstance(value, basestring):
                 warn('[3.9] %s: vocabulary value should be an unicode string'
                      % self, DeprecationWarning)
                 vocab[i] = (label, unicode(value))