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

[Philipp von Weitershausen]

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

Modified Files:
	vocabularywidget.py widget.py 
Log Message:
New interface declaration.


=== Zope3/src/zope/app/browser/form/vocabularywidget.py 1.35 => 1.36 ===
--- Zope3/src/zope/app/browser/form/vocabularywidget.py:1.35	Fri Jun  6 17:07:25 2003
+++ Zope3/src/zope/app/browser/form/vocabularywidget.py	Fri Jun  6 17:35:17 2003
@@ -22,6 +22,7 @@
 
 from xml.sax.saxutils import quoteattr
 
+from zope.interface import implements, implementedBy
 from zope.app.browser.form import widget
 from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.interfaces.browser.form import IVocabularyQueryView
@@ -103,7 +104,7 @@
 class IterableVocabularyQuery(object):
     """Simple query object used to invoke the simple selection mechanism."""
 
-    __implements__ = IIterableVocabularyQuery
+    implements(IIterableVocabularyQuery)
 
     def __init__(self, vocabulary):
         self.vocabulary = vocabulary
@@ -482,7 +483,7 @@
     This widget can be used when the number of selections isn't going
     to be very large.
     """
-    __implements__ = widget.SingleItemsWidget.__implements__
+    implements(implementedBy(widget.SingleItemsWidget))
     propertyNames = VocabularyEditWidgetBase.propertyNames + ['firstItem']
     firstItem = False
 
@@ -542,7 +543,7 @@
 class VocabularyQueryViewBase(ActionHelper, ViewSupport, BrowserView):
     """Vocabulary query support base class."""
 
-    __implements__ = IVocabularyQueryView
+    implements(IVocabularyQueryView)
 
     # This specifically isn't a widget in it's own right, but is a
     # form of BrowserView (at least conceptually).
@@ -604,7 +605,7 @@
     getQuery() returns None.
     """
 
-    __implements__ = IVocabularyQueryView
+    implements(IVocabularyQueryView)
 
     queryResultBatchSize = 8
 


=== Zope3/src/zope/app/browser/form/widget.py 1.33 => 1.34 ===
--- Zope3/src/zope/app/browser/form/widget.py:1.33	Wed May 28 11:46:00 2003
+++ Zope3/src/zope/app/browser/form/widget.py	Fri Jun  6 17:35:17 2003
@@ -18,6 +18,7 @@
 __metaclass__ = type
 
 import warnings
+from zope.interface import implements
 from zope.proxy import removeAllProxies
 from zope.publisher.browser import BrowserView
 from zope.app.interfaces.browser.form import IBrowserWidget
@@ -78,7 +79,7 @@
     
     """
 
-    __implements__ = IBrowserWidget
+    implements(IBrowserWidget)
 
     propertyNames = (Widget.propertyNames +
                      ['tag', 'type', 'cssClass', 'extra'])
@@ -752,7 +753,6 @@
 
 class ListWidget(SingleItemsWidget):
     """List widget."""
-    __implements__ = SingleItemsWidget.__implements__
     propertyNames = (SingleItemsWidget.propertyNames +
                      ['firstItem', 'items', 'size', 'extra']
                      )