web/formfields.py
changeset 9257 ce338133c92c
parent 9217 b4ac21bf6019
child 9283 5f2c5eb1a820
--- a/web/formfields.py	Mon Aug 26 16:14:09 2013 +0200
+++ b/web/formfields.py	Mon Aug 26 16:15:29 2013 +0200
@@ -404,17 +404,6 @@
                      for label, value in vocab]
         if self.sort:
             vocab = vocab_sort(vocab)
-        # XXX pre 3.9 bw compat
-        for i, option in enumerate(vocab):
-            # option may be a 2 or 3-uple (see Select widget _render method for
-            # explanation)
-            value = option[1]
-            if value is not None and not isinstance(value, basestring):
-                warn('[3.9] %s: vocabulary value should be an unicode string'
-                     % self, DeprecationWarning)
-                option = list(option)
-                option[1] = unicode(value)
-                vocab[i] = option
         return vocab
 
     # support field as argument to avoid warning when used as format field value