#98111: (reopened) z.a.form.browser.itemswidget.MultiDataHelper._toFi…

…eldValue() fix for empty values
zopefoundation · May 1, 2007 · 2082ed4 · 2082ed4
1 parent 0266b53
commit 2082ed4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/browser/itemswidgets.py b/browser/itemswidgets.py
@@ -190,8 +190,8 @@ class MultiDataHelper(object):
     def _toFieldValue(self, input):
         """See SimpleInputWidget"""
         if input is None:
-            return []
-        if not isinstance(input, list):
+            input = []
+        elif not isinstance(input, list):
             input = [input]
         try:
             values = self.convertTokensToValues(input)

diff --git a/browser/tests/test_itemswidget.py b/browser/tests/test_itemswidget.py
@@ -454,6 +454,9 @@ def test_getInputValue(self):
         self.assertEqual(widget.getInputValue(), ['two', 'three'])
 
         self._field = ICollector.get('letters')
+        widget = self._makeWidget(form={'field.letters-empty-marker': '1'})
+        widget.setPrefix('field.')
+        self.assertEqual(widget.getInputValue(), sets.Set())
         widget = self._makeWidget(form={'field.letters': ['token2','token3']})
         widget.setPrefix('field.')
         self.assertEqual(widget.getInputValue(), sets.Set(['two', 'three']))