[Checkins] SVN: z3c.formwidget.query/trunk/src/z3c/formwidget/query/widget.py There may not be a value yet. Don't crash if this is the case

Martin Aspeli optilude at gmx.net
Wed Mar 25 00:46:19 EDT 2009


Log message for revision 98350:
  There may not be a value yet. Don't crash if this is the case

Changed:
  U   z3c.formwidget.query/trunk/src/z3c/formwidget/query/widget.py

-=-
Modified: z3c.formwidget.query/trunk/src/z3c/formwidget/query/widget.py
===================================================================
--- z3c.formwidget.query/trunk/src/z3c/formwidget/query/widget.py	2009-03-25 04:22:26 UTC (rev 98349)
+++ z3c.formwidget.query/trunk/src/z3c/formwidget/query/widget.py	2009-03-25 04:46:19 UTC (rev 98350)
@@ -115,9 +115,11 @@
         elif not self.ignoreContext:
             
             selection = zope.component.getMultiAdapter(
-                (self.context, self.field), z3c.form.interfaces.IDataManager).get()
-
-            if not isinstance(selection, (tuple, set, list)):
+                (self.context, self.field), z3c.form.interfaces.IDataManager).query()
+            
+            if selection is z3c.form.interfaces.NOVALUE:
+                selection = []
+            elif not isinstance(selection, (tuple, set, list)):
                 selection = [selection]
             
             terms = set([source.getTerm(value) for value in selection if value])



More information about the Checkins mailing list