[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/form/browser/ Fixed an accidental regression.

[Gintautas Miliauskas]

Log message for revision 28920:
  Fixed an accidental regression.
  

Changed:
  U   Zope3/trunk/src/zope/app/form/browser/tests/test_textwidget.py
  U   Zope3/trunk/src/zope/app/form/browser/textwidgets.py
  U   Zope3/trunk/src/zope/app/form/browser/widget.py

-=-
Modified: Zope3/trunk/src/zope/app/form/browser/tests/test_textwidget.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/tests/test_textwidget.py	2005-01-24 14:35:01 UTC (rev 28919)
+++ Zope3/trunk/src/zope/app/form/browser/tests/test_textwidget.py	2005-01-24 14:59:47 UTC (rev 28920)
@@ -232,7 +232,7 @@
     """
     There was a bug that caused the value attribute to be set to
     'value' under these circumstances.
-    
+
     >>> from zope.publisher.browser import TestRequest
     >>> from zope.schema import TextLine
     >>> field = TextLine(__name__='foo', title=u'on',

Modified: Zope3/trunk/src/zope/app/form/browser/textwidgets.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/textwidgets.py	2005-01-24 14:35:01 UTC (rev 28919)
+++ Zope3/trunk/src/zope/app/form/browser/textwidgets.py	2005-01-24 14:59:47 UTC (rev 28920)
@@ -122,7 +122,7 @@
 
     def __call__(self):
         value = self._getFormValue()
-        if value == self._missing:
+        if value is None or value == self.context.missing_value:
             value = ''
 
         kwargs = {'type': self.type,

Modified: Zope3/trunk/src/zope/app/form/browser/widget.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/widget.py	2005-01-24 14:35:01 UTC (rev 28919)
+++ Zope3/trunk/src/zope/app/form/browser/widget.py	2005-01-24 14:59:47 UTC (rev 28920)
@@ -298,7 +298,7 @@
         except ConversionError, error:
             # ConversionError is already a WidgetInputError
             self._error = error
-            raise self._error            
+            raise self._error
 
         # allow missing values only for non-required fields
         if value == field.missing_value and not field.required:
@@ -457,7 +457,7 @@
         items = kw.items()
         items.sort()
         for key, value in items:
-            if value == None:
+            if value is None:
                 warnings.warn(
                     "None was passed for attribute %r.  Passing None "
                     "as attribute values to renderTag is deprecated. "