[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - updated widget imports

[Yvo Schubbe]

Log message for revision 120588:
  - updated widget imports

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/formlib/widgets.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py	2011-02-28 07:55:15 UTC (rev 120587)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py	2011-02-28 08:08:17 UTC (rev 120588)
@@ -15,9 +15,9 @@
 
 import urlparse
 
-from zope.app.form.browser import BytesWidget
 from zope.component import adapts
 from zope.formlib import form
+from zope.formlib.widgets import BytesWidget
 from zope.interface import implements
 from zope.interface import Interface
 from zope.schema import ASCIILine

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py	2011-02-28 07:55:15 UTC (rev 120587)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py	2011-02-28 08:08:17 UTC (rev 120588)
@@ -15,9 +15,9 @@
 
 import urlparse
 
-from zope.app.form.browser import BytesWidget
 from zope.component import adapts
 from zope.formlib import form
+from zope.formlib.widgets import BytesWidget
 from zope.interface import implements
 from zope.interface import Interface
 from zope.schema import ASCIILine

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py	2011-02-28 07:55:15 UTC (rev 120587)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py	2011-02-28 08:08:17 UTC (rev 120588)
@@ -14,10 +14,10 @@
 """
 
 from Acquisition import aq_self
-from zope.app.form.browser import DatetimeI18nWidget
 from zope.component import adapts
 from zope.component import getUtility
 from zope.formlib import form
+from zope.formlib.widgets import DatetimeI18nWidget
 from zope.interface import implements
 from zope.interface import Interface
 from zope.schema import Choice

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py	2011-02-28 07:55:15 UTC (rev 120587)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py	2011-02-28 08:08:17 UTC (rev 120588)
@@ -20,8 +20,8 @@
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zExceptions import Forbidden
 from zExceptions import Redirect
-from zope.app.form.browser import TextWidget
 from zope.formlib import form
+from zope.formlib.widgets import TextWidget
 from zope.interface import implements
 from zope.interface import Interface
 from zope.schema import Bool

Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/widgets.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/widgets.py	2011-02-28 07:55:15 UTC (rev 120587)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/widgets.py	2011-02-28 08:08:17 UTC (rev 120588)
@@ -12,21 +12,21 @@
 ##############################################################################
 """Custom form widgets."""
 
-from zope.app.form import InputWidget
-from zope.app.form.browser import ASCIIWidget
-from zope.app.form.browser import BrowserWidget
-from zope.app.form.browser import FileWidget
-from zope.app.form.browser import MultiCheckBoxWidget
-from zope.app.form.browser import MultiSelectSetWidget
-from zope.app.form.browser import MultiSelectWidget
-from zope.app.form.browser import RadioWidget
-from zope.app.form.browser import TextWidget
-from zope.app.form.browser import TextAreaWidget
-from zope.app.form.interfaces import ConversionError
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.interfaces import WidgetInputError
 from zope.component import adapts
 from zope.component import getUtility
+from zope.formlib.interfaces import ConversionError
+from zope.formlib.interfaces import IInputWidget
+from zope.formlib.interfaces import WidgetInputError
+from zope.formlib.widget import InputWidget
+from zope.formlib.widgets import ASCIIWidget
+from zope.formlib.widgets import BrowserWidget
+from zope.formlib.widgets import FileWidget
+from zope.formlib.widgets import MultiCheckBoxWidget
+from zope.formlib.widgets import MultiSelectSetWidget
+from zope.formlib.widgets import MultiSelectWidget
+from zope.formlib.widgets import RadioWidget
+from zope.formlib.widgets import TextAreaWidget
+from zope.formlib.widgets import TextWidget
 from zope.i18nmessageid import MessageFactory
 from zope.interface import implementsOnly
 from zope.publisher.interfaces.browser import IBrowserRequest