[Checkins] SVN: zc.table/trunk/ Replace zope.app.form dependency with zope.formlib and zope.browserpage

[Marius Gedminas]

Log message for revision 124789:
  Replace zope.app.form dependency with zope.formlib and zope.browserpage
  

Changed:
  U   zc.table/trunk/CHANGES.txt
  U   zc.table/trunk/setup.py
  U   zc.table/trunk/src/zc/table/batching.py
  U   zc.table/trunk/src/zc/table/column.py
  U   zc.table/trunk/src/zc/table/fieldcolumn.py
  U   zc.table/trunk/src/zc/table/tests.py

-=-
Modified: zc.table/trunk/CHANGES.txt
===================================================================
--- zc.table/trunk/CHANGES.txt	2012-03-29 13:17:03 UTC (rev 124788)
+++ zc.table/trunk/CHANGES.txt	2012-03-29 13:29:46 UTC (rev 124789)
@@ -1,7 +1,7 @@
 CHANGES
 =======
 
-0.8.2 (unreleased)
+0.9.0 (unreleased)
 ------------------
 
 - Using Python's ``doctest`` module instead of deprecated
@@ -9,7 +9,7 @@
 
 - Removed deprecated slugs for ZPKG and ZCML.
 
-- Removed dependency on ``zope.app.testing``.
+- Removed dependency on ``zope.app.testing`` and ``zope.app.form``.
 
 - Move ``zope.testing`` to test extra.
 

Modified: zc.table/trunk/setup.py
===================================================================
--- zc.table/trunk/setup.py	2012-03-29 13:17:03 UTC (rev 124788)
+++ zc.table/trunk/setup.py	2012-03-29 13:29:46 UTC (rev 124789)
@@ -2,12 +2,13 @@
 
 setup(
     name="zc.table",
-    version="0.8.1",
+    version="0.9.0dev",
     url="http://pypi.python.org/pypi/zc.table/",
     install_requires=[
         'setuptools',
         'zc.resourcelibrary >= 0.6',
-        'zope.app.form',
+        'zope.browserpage >= 3.10',
+        'zope.formlib >= 4',
         'zope.cachedescriptors',
         'zope.component',
         'zope.formlib',
@@ -15,7 +16,9 @@
         'zope.interface',
         'zope.schema',
     ],
-    extras_require=dict(test=['zope.testing']),
+    extras_require=dict(
+        test=['zope.testing',
+              'zope.publisher']),
     packages=find_packages('src'),
     package_dir= {'':'src'},
 

Modified: zc.table/trunk/src/zc/table/batching.py
===================================================================
--- zc.table/trunk/src/zc/table/batching.py	2012-03-29 13:17:03 UTC (rev 124788)
+++ zc.table/trunk/src/zc/table/batching.py	2012-03-29 13:29:46 UTC (rev 124789)
@@ -14,7 +14,7 @@
 """Table formatting and configuration
 """
 from zope import interface
-from zope.app import pagetemplate
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 
 import zc.table.table
 import zc.table.interfaces
@@ -107,7 +107,7 @@
             self.previous_batch_start = None
         self._batch_start_computed = True
 
-    batching_template = pagetemplate.ViewPageTemplateFile('batching.pt')
+    batching_template = ViewPageTemplateFile('batching.pt')
     def renderExtra(self):
         if not self._batch_start_computed:
             self.updateBatching()

Modified: zc.table/trunk/src/zc/table/column.py
===================================================================
--- zc.table/trunk/src/zc/table/column.py	2012-03-29 13:17:03 UTC (rev 124788)
+++ zc.table/trunk/src/zc/table/column.py	2012-03-29 13:29:46 UTC (rev 124789)
@@ -19,8 +19,8 @@
 from xml.sax.saxutils import quoteattr
 
 from zope import interface, component, schema, i18n
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.interfaces import WidgetInputError, WidgetsError
+from zope.formlib.interfaces import IInputWidget
+from zope.formlib.interfaces import WidgetInputError, WidgetsError
 
 from zc.table import interfaces
 

Modified: zc.table/trunk/src/zc/table/fieldcolumn.py
===================================================================
--- zc.table/trunk/src/zc/table/fieldcolumn.py	2012-03-29 13:17:03 UTC (rev 124788)
+++ zc.table/trunk/src/zc/table/fieldcolumn.py	2012-03-29 13:29:46 UTC (rev 124789)
@@ -19,8 +19,8 @@
 import zope.formlib.interfaces
 import zope.formlib.form
 
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
-from zope.app.form.interfaces import WidgetInputError, WidgetsError
+from zope.formlib.interfaces import IInputWidget, IDisplayWidget
+from zope.formlib.interfaces import WidgetInputError, WidgetsError
 
 from zc.table import column
 

Modified: zc.table/trunk/src/zc/table/tests.py
===================================================================
--- zc.table/trunk/src/zc/table/tests.py	2012-03-29 13:17:03 UTC (rev 124788)
+++ zc.table/trunk/src/zc/table/tests.py	2012-03-29 13:29:46 UTC (rev 124789)
@@ -20,49 +20,49 @@
 from zope.component.testing import setUp, tearDown
 import zope.publisher.interfaces.browser
 import zope.schema.interfaces
-import zope.app.form.browser
+import zope.formlib.widgets
 
 
 def columnSetUp(test):
     setUp(test)
     component.provideAdapter(
-        zope.app.form.browser.TextWidget,
+        zope.formlib.widgets.TextWidget,
         (zope.schema.interfaces.ITextLine,
          zope.publisher.interfaces.browser.IBrowserRequest,
          ),
-        zope.app.form.interfaces.IInputWidget)
+        zope.formlib.interfaces.IInputWidget)
     component.provideAdapter(
-        zope.app.form.browser.CheckBoxWidget,
+        zope.formlib.widgets.CheckBoxWidget,
         (zope.schema.interfaces.IBool,
          zope.publisher.interfaces.browser.IBrowserRequest,
          ),
-        zope.app.form.interfaces.IInputWidget)
+        zope.formlib.interfaces.IInputWidget)
 
 
 def fieldColumnSetUp(test):
     columnSetUp(test)
     component.provideAdapter(
-        zope.app.form.browser.ChoiceDisplayWidget,
+        zope.formlib.widgets.ChoiceDisplayWidget,
         (zope.schema.interfaces.IChoice,
          zope.publisher.interfaces.browser.IBrowserRequest),
-        zope.app.form.interfaces.IDisplayWidget)
+        zope.formlib.interfaces.IDisplayWidget)
     component.provideAdapter(
-        zope.app.form.browser.ChoiceInputWidget,
+        zope.formlib.widgets.ChoiceInputWidget,
         (zope.schema.interfaces.IChoice,
          zope.publisher.interfaces.browser.IBrowserRequest),
-        zope.app.form.interfaces.IInputWidget)
+        zope.formlib.interfaces.IInputWidget)
     component.provideAdapter(
-        zope.app.form.browser.DropdownWidget,
+        zope.formlib.widgets.DropdownWidget,
         (zope.schema.interfaces.IChoice,
          zope.schema.interfaces.IVocabularyTokenized,
          zope.publisher.interfaces.browser.IBrowserRequest),
-        zope.app.form.interfaces.IInputWidget)
+        zope.formlib.interfaces.IInputWidget)
     component.provideAdapter(
-        zope.app.form.browser.ChoiceDisplayWidget,
+        zope.formlib.widgets.ChoiceDisplayWidget,
         (zope.schema.interfaces.IChoice,
          zope.schema.interfaces.IVocabularyTokenized,
          zope.publisher.interfaces.browser.IBrowserRequest),
-        zope.app.form.interfaces.IDisplayWidget)
+        zope.formlib.interfaces.IDisplayWidget)
 
 
 def test_suite():