Merge ac01379 into 23f730a

wtforms · Nov 21, 2019 · 8652b2a · 8652b2a
2 parents 23f730a + ac01379
commit 8652b2a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/wtforms/fields/core.py b/src/wtforms/fields/core.py
@@ -522,7 +522,12 @@ def __init__(
         self.validate_choice = validate_choice
 
     def iter_choices(self):
-        for value, label in self.choices:
+        if isinstance(self.choices[0], (list, tuple)):
+            choices = self.choices
+        else:
+            choices = zip(self.choices, self.choices)
+
+        for value, label in choices:
             yield (value, label, self.coerce(value) == self.data)
 
     def process_data(self, value):