[POS-commit] r4012 - in kiwi/trunk: tests

[Henrique Romano]

Author: henrique
Date: Fri Jul 28 10:43:09 2006
New Revision: 4012

Modified:
   kiwi/trunk/kiwi/ui/widgets/entry.py
   kiwi/trunk/kiwi/ui/widgets/spinbutton.py
   kiwi/trunk/tests/test_proxy.py

Log:
Manage the case where ValueUnset is received by update().
r=jdahlin


Modified: kiwi/trunk/kiwi/ui/widgets/entry.py
==============================================================================
--- kiwi/trunk/kiwi/ui/widgets/entry.py	(original)
+++ kiwi/trunk/kiwi/ui/widgets/entry.py	Fri Jul 28 10:43:09 2006
@@ -29,7 +29,8 @@
 
 import pango
 
-from kiwi.datatypes import ValidationError, converter, number
+from kiwi.datatypes import ValidationError, converter, number, \
+     ValueUnset
 from kiwi.decorators import deprecated
 from kiwi.python import deprecationwarn
 from kiwi.ui.entry import MaskError, KiwiEntry, ENTRY_MODE_TEXT, \
@@ -192,7 +193,7 @@
             raise AssertionError
 
     def update(self, data):
-        if data is None:
+        if data is None or data is ValueUnset:
             text = ""
         else:
             mode = self._mode

Modified: kiwi/trunk/kiwi/ui/widgets/spinbutton.py
==============================================================================
--- kiwi/trunk/kiwi/ui/widgets/spinbutton.py	(original)
+++ kiwi/trunk/kiwi/ui/widgets/spinbutton.py	Fri Jul 28 10:43:09 2006
@@ -32,7 +32,7 @@
 
 import gtk
 
-from kiwi.datatypes import number
+from kiwi.datatypes import number, ValueUnset
 from kiwi.python import deprecationwarn
 from kiwi.ui.icon import IconEntry
 from kiwi.ui.proxywidget import ValidatableProxyWidgetMixin
@@ -71,7 +71,7 @@
         return self._from_string(self.get_text())
 
     def update(self, data):
-        if data is None:
+        if data is None or data is ValueUnset:
             self.set_text("")
         else:
             # set_value accepts a float or int, no as_string conversion needed,

Modified: kiwi/trunk/tests/test_proxy.py
==============================================================================
--- kiwi/trunk/tests/test_proxy.py	(original)
+++ kiwi/trunk/tests/test_proxy.py	Fri Jul 28 10:43:09 2006
@@ -156,3 +156,9 @@
         self.assertEqual(self.view.textview.read(), '')
         self.assertEqual(self.view.comboentry.read(), None)
         self.assertEqual(self.view.combobox.read(), 'CB1')
+
+    def testValueUnset(self):
+        self.view.entry.update(ValueUnset)
+        self.assertEqual(self.view.entry.get_text(), "")
+        self.view.spinbutton.update(ValueUnset)
+        self.assertEqual(self.view.spinbutton.get_text(), "")