Changeset 5365

Timestamp:

4 Aug 2010, 18:34:50 (14 years ago)

Author:

uli

Message:

• Clean up imports.

• Add sorting. So we can be sure, the dict contents is always shown in the same order (sorted by key).

• Remove unused code.

File:

• main/waeup.widgets.core/trunk/src/waeup/widgets/core/dictwidget.py (modified) (6 diffs)

main/waeup.widgets.core/trunk/src/waeup/widgets/core/dictwidget.py

@@ -20 +20 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-import grok
 from zope.browserpage import ViewPageTemplateFile
 from zope.component import getMultiAdapter
 from zope.formlib.i18n import _
-from zope.formlib.interfaces import (
-    ISimpleInputWidget, IInputWidget, IDisplayWidget)
+from zope.formlib.interfaces import IInputWidget, IDisplayWidget
 from zope.formlib.sequencewidget import SequenceWidget
 from zope.formlib.widget import DisplayWidget, renderElement
@@ -32 +30 @@
 from zope.schema.interfaces import IDict, IField
 
+def sort_dict_items(x, y):
+    """Sort items of a dict by key.
+
+    As we don't know what type the key is, `cmp` should serve as
+    solution for most basic types.
+    """
+    return cmp(x[0], y[0])
+
+
 class DictWidget(SequenceWidget):
+    """An IInputWidget that renders dictionaries.
+
+    Items are displayed in key order.
+    """
     _type = dict
     template = ViewPageTemplateFile('dictwidget.pt')
@@ -77 +88 @@
         return self._widgets[i]
             
-        if i not in self._widgets:
-            field = self.context.value_type
-            if self.subwidget is not None:
-                widget = self.subwidget(field, self.request)
-            else:
-                widget = getMultiAdapter(
-                    (field, self.request), IInputWidget)
-            widget.setPrefix('%s.%d.' % (self.name, i))
-            if not self.preserve_widgets:
-                return widget
-            self._widgets[i] = widget
-        return self._widgets[i]
-
     def widgets(self):
         """Return a list of widgets to display"""
         sequence = self._getRenderedValue()
         result = []
-        for i, value in enumerate(sequence.items()):
+        # for i, item in enumerate(data.items()):
+        for i, value in enumerate(sorted(
+                sequence.items(), cmp=sort_dict_items)):
+            # for i, value in enumerate(sequence.items()):
             widget = self._getWidget(i)
             widget[0].setRenderedValue(value[0])
@@ -206 +207 @@
 
 class DictDisplayWidget(DisplayWidget):
-
+    """A display widget for dictionaries.
+
+    Items are displayed in key order.
+    """
+    
     _missingValueMessage = _("sequence-value-not-provided",
                              u"(no value available)")
@@ -237 +242 @@
 
         parts = []
-        for i, item in enumerate(data.items()):
+        # for i, item in enumerate(data.items()):
+        for i, item in enumerate(sorted(data.items(), cmp=sort_dict_items)):
             key_widget, value_widget = self._getWidget(i)
             key_widget.setRenderedValue(item[0])
@@ -270 +276 @@
         value_widget.setPrefix('%s.value.%d.' % (self.name, i))
         return (key_widget, value_widget)
-