[Zope3-checkins] CVS: Zope3/src/zope/app/browser/form - vocabularywidget.py:1.63.4.2 widget.py:1.64.4.7

[Garrett Smith]

Update of /cvs-repository/Zope3/src/zope/app/browser/form
In directory cvs.zope.org:/tmp/cvs-serv10762/src/zope/app/browser/form

Modified Files:
      Tag: ozzope-widgets-branch
	vocabularywidget.py widget.py 
Log Message:

Created a utility method _renderedValueSet that clarifies the use of
_data_marker.


=== Zope3/src/zope/app/browser/form/vocabularywidget.py 1.63.4.1 => 1.63.4.2 ===
--- Zope3/src/zope/app/browser/form/vocabularywidget.py:1.63.4.1	Sat Feb  7 23:36:00 2004
+++ Zope3/src/zope/app/browser/form/vocabularywidget.py	Sun Feb  8 23:29:04 2004
@@ -190,7 +190,7 @@
         self.empty_marker_name = self.name + "-empty-marker"
 
     def __call__(self):
-        if self._data is self._data_marker:
+        if not self._renderedValueSet():
             if self.hasInput():
                 try:
                     value = self.getInputValue()


=== Zope3/src/zope/app/browser/form/widget.py 1.64.4.6 => 1.64.4.7 ===
--- Zope3/src/zope/app/browser/form/widget.py:1.64.4.6	Sun Feb  8 02:37:56 2004
+++ Zope3/src/zope/app/browser/form/widget.py	Sun Feb  8 23:29:04 2004
@@ -244,7 +244,7 @@
     def _showData(self):
         """Returns a value suitable for use as an HTML form value."""
 
-        if self._data is self._data_marker:
+        if not self._renderedValueSet():
             if self.hasInput():
                 try:
                     value = self.getInputValue()