[Zope3-checkins] CVS: Zope3/src/zope/app/browser/form - add.py:1.40 addwizard.py:1.14 configure.zcml:1.28 editview.py:1.52 editwizard.py:1.25 vocabularywidget.py:1.67 widget.py:1.68

Stephan Richter srichter at cosmos.phy.tufts.edu
Sat Mar 13 16:37:51 EST 2004


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

Modified Files:
	add.py addwizard.py configure.zcml editview.py editwizard.py 
	vocabularywidget.py widget.py 
Log Message:


Moved form interfaces to zope.app.form.interfaces.


=== Zope3/src/zope/app/browser/form/add.py 1.39 => 1.40 ===
--- Zope3/src/zope/app/browser/form/add.py:1.39	Fri Mar  5 23:17:17 2004
+++ Zope3/src/zope/app/browser/form/add.py	Sat Mar 13 16:37:20 2004
@@ -24,8 +24,7 @@
 from zope.app.event.objectevent import ObjectCreatedEvent
 from zope.app.form.utility import setUpWidgets, getWidgetsData
 from zope.app.i18n import ZopeMessageIDFactory as _
-from zope.app.interfaces.form import IInputWidget
-from zope.app.interfaces.form import WidgetsError
+from zope.app.form.interfaces import IInputWidget, WidgetsError
 from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import getAdapter


=== Zope3/src/zope/app/browser/form/addwizard.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/browser/form/addwizard.py:1.13	Fri Mar  5 23:17:17 2004
+++ Zope3/src/zope/app/browser/form/addwizard.py	Sat Mar 13 16:37:20 2004
@@ -21,8 +21,7 @@
 from zope.app.event import publish
 from zope.app.event.objectevent import ObjectCreatedEvent
 from zope.app.form.utility import setUpWidgets
-from zope.app.interfaces.form import WidgetsError
-from zope.app.interfaces.form import IInputWidget
+from zope.app.form.interfaces import WidgetsError, IInputWidget
 from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import getAdapter


=== Zope3/src/zope/app/browser/form/configure.zcml 1.27 => 1.28 ===
--- Zope3/src/zope/app/browser/form/configure.zcml:1.27	Fri Mar  5 23:17:17 2004
+++ Zope3/src/zope/app/browser/form/configure.zcml	Sat Mar 13 16:37:20 2004
@@ -5,7 +5,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"     
       for="zope.schema.interfaces.IField"
-      provides="zope.app.interfaces.form.IDisplayWidget"
+      provides="zope.app.form.interfaces.IDisplayWidget"
       factory="zope.app.browser.form.widget.DisplayWidget"
       permission="zope.Public"
       />
@@ -15,7 +15,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.ITextLine"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.TextWidget"
       permission="zope.Public"
       />
@@ -23,7 +23,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IText"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.TextAreaWidget"
       permission="zope.Public"
       />
@@ -31,7 +31,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.ISourceText"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.TextAreaWidget"
       permission="zope.Public"
       />
@@ -39,7 +39,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IBytesLine"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.BytesWidget"
       permission="zope.Public"
       />
@@ -47,7 +47,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IBytes"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.FileWidget"
       permission="zope.Public"
       />
@@ -55,7 +55,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IASCII"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.BytesAreaWidget"
       permission="zope.Public"
       />
@@ -63,7 +63,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IInt"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.IntWidget"
       permission="zope.Public"
       />
@@ -71,7 +71,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IFloat"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.FloatWidget"
       permission="zope.Public"
       />
@@ -79,7 +79,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IDatetime"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.DatetimeWidget"
       permission="zope.Public"
       />
@@ -87,7 +87,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IDate"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.DateWidget"
       permission="zope.Public"
       />
@@ -95,7 +95,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IBool"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.CheckBoxWidget"
       permission="zope.Public"
       />
@@ -103,7 +103,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.ITuple"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.TupleSequenceWidget"
       permission="zope.Public"
       />
@@ -111,7 +111,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IList"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.ListSequenceWidget"
       permission="zope.Public"
       />
@@ -119,7 +119,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IPassword"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory="zope.app.browser.form.widget.PasswordWidget"
       permission="zope.Public"
       />
@@ -129,7 +129,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IEnumeratedTextLine"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".enumerated.EnumeratedTextWidget"
       permission="zope.Public"
       />
@@ -137,7 +137,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IEnumeratedInt"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".enumerated.EnumeratedIntWidget"
       permission="zope.Public"
       />
@@ -145,7 +145,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IEnumeratedFloat"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".enumerated.EnumeratedFloatWidget"
       permission="zope.Public"
       />
@@ -153,7 +153,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IEnumeratedDatetime"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".enumerated.EnumeratedDatetimeWidget"
       permission="zope.Public"
       />
@@ -161,7 +161,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IEnumeratedDate"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".enumerated.EnumeratedDateWidget"
       permission="zope.Public"
       />
@@ -174,7 +174,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyField"
-      provides="zope.app.interfaces.form.IDisplayWidget"
+      provides="zope.app.form.interfaces.IDisplayWidget"
       factory=".vocabularywidget.VocabularyFieldDisplayWidget"
       permission="zope.Public"
       />
@@ -182,7 +182,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyField"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".vocabularywidget.VocabularyFieldEditWidget"
       permission="zope.Public"
       />
@@ -192,7 +192,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyBagField"
-      provides="zope.app.interfaces.form.IDisplayWidget"
+      provides="zope.app.form.interfaces.IDisplayWidget"
       factory=".vocabularywidget.VocabularyBagFieldDisplayWidget"
       permission="zope.Public"
       />
@@ -200,7 +200,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyBagField"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".vocabularywidget.VocabularyBagFieldEditWidget"
       permission="zope.Public"
       />
@@ -210,7 +210,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyListField"
-      provides="zope.app.interfaces.form.IDisplayWidget"
+      provides="zope.app.form.interfaces.IDisplayWidget"
       factory=".vocabularywidget.VocabularyListFieldDisplayWidget"
       permission="zope.Public"
       />
@@ -218,7 +218,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyListField"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".vocabularywidget.VocabularyListFieldEditWidget"
       permission="zope.Public"
       />
@@ -228,7 +228,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularySetField"
-      provides="zope.app.interfaces.form.IDisplayWidget"
+      provides="zope.app.form.interfaces.IDisplayWidget"
       factory=".vocabularywidget.VocabularySetFieldDisplayWidget"
       permission="zope.Public"
       />
@@ -236,7 +236,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularySetField"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".vocabularywidget.VocabularySetFieldEditWidget"
       permission="zope.Public"
       />
@@ -246,7 +246,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyUniqueListField"
-      provides="zope.app.interfaces.form.IDisplayWidget"
+      provides="zope.app.form.interfaces.IDisplayWidget"
       factory=".vocabularywidget.VocabularyUniqueListFieldDisplayWidget"
       permission="zope.Public"
       />
@@ -254,7 +254,7 @@
   <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IVocabularyUniqueListField"
-      provides="zope.app.interfaces.form.IInputWidget"
+      provides="zope.app.form.interfaces.IInputWidget"
       factory=".vocabularywidget.VocabularyUniqueListFieldEditWidget"
       permission="zope.Public"
       />


=== Zope3/src/zope/app/browser/form/editview.py 1.51 => 1.52 ===
--- Zope3/src/zope/app/browser/form/editview.py:1.51	Fri Mar  5 23:17:17 2004
+++ Zope3/src/zope/app/browser/form/editview.py	Sat Mar 13 16:37:20 2004
@@ -26,7 +26,7 @@
 from zope.app.event import publish
 from zope.app.event.objectevent import ObjectModifiedEvent
 from zope.app.i18n import ZopeMessageIDFactory as _
-from zope.app.interfaces.form import WidgetsError
+from zope.app.form.interfaces import WidgetsError
 from zope.app.location.interfaces import ILocation
 from zope.app.location import LocationProxy
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile


=== Zope3/src/zope/app/browser/form/editwizard.py 1.24 => 1.25 ===
--- Zope3/src/zope/app/browser/form/editwizard.py:1.24	Fri Mar  5 23:17:17 2004
+++ Zope3/src/zope/app/browser/form/editwizard.py	Sat Mar 13 16:37:20 2004
@@ -35,8 +35,7 @@
 
 from editview import EditView
 from submit import Next, Previous, Update
-from zope.app.interfaces.form import WidgetInputError
-from zope.app.interfaces.form import WidgetsError
+from zope.app.form.interfaces import WidgetInputError, WidgetsError
 from zope.app.form.utility \
         import setUpEditWidgets, getWidgetsData, applyWidgetsChanges
 


=== Zope3/src/zope/app/browser/form/vocabularywidget.py 1.66 => 1.67 ===
--- Zope3/src/zope/app/browser/form/vocabularywidget.py:1.66	Mon Mar  8 18:33:57 2004
+++ Zope3/src/zope/app/browser/form/vocabularywidget.py	Sat Mar 13 16:37:20 2004
@@ -33,7 +33,7 @@
 from zope.app.browser.form import widget
 from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.browser.interfaces.form import IVocabularyQueryView
-from zope.app.interfaces.form import WidgetInputError
+from zope.app.form.interfaces import WidgetInputError
 
 
 # These widget factories delegate to the vocabulary on the field.


=== Zope3/src/zope/app/browser/form/widget.py 1.67 => 1.68 ===
--- Zope3/src/zope/app/browser/form/widget.py:1.67	Mon Mar  8 18:33:57 2004
+++ Zope3/src/zope/app/browser/form/widget.py	Sat Mar 13 16:37:20 2004
@@ -29,12 +29,12 @@
 
 from zope.app import zapi
 from zope.app.tests import ztapi
-from zope.app.interfaces.form import IInputWidget
+from zope.app.form.interfaces import IInputWidget
 from zope.app.browser.interfaces.form import IBrowserWidget
 from zope.app.form.widget import Widget
 from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges
-from zope.app.interfaces.form import ConversionError, WidgetInputError
-from zope.app.interfaces.form import MissingInputError
+from zope.app.form.interfaces import ConversionError, WidgetInputError
+from zope.app.form.interfaces import MissingInputError
 from zope.app.datetimeutils import parseDatetimetz
 from zope.app.datetimeutils import DateTimeError
 from zope.app.i18n import ZopeMessageIDFactory as _
@@ -50,7 +50,7 @@
     a lot of machinery to support translation and views:
         
     >>> setUp() # now we have to set up an error view...
-    >>> from zope.app.interfaces.form import IWidgetInputError
+    >>> from zope.app.form.interfaces import IWidgetInputError
     >>> from zope.app.publisher.browser import BrowserView
     >>> from cgi import escape
     >>> class SnippetErrorView(BrowserView):




More information about the Zope3-Checkins mailing list