adjust dependencies

setup.py

@@ -51,11 +51,14 @@ def read(*rnames):
     namespace_packages = ['z3c'],
     extras_require = dict(
         test = [
+            'z3c.macro',
             'z3c.table',
             'z3c.testing',
+            'zope.app.testing',
+            'zope.app.publisher',
+            'zope.browserpage',
             'zope.publisher',
             'zope.testing',
-            'z3c.form [test]',
             ],
         ),
     install_requires = [

src/z3c/tabular/README.txt

@@ -23,14 +23,13 @@ registered correctly.
   >>> from zope.configuration import xmlconfig
   >>> import zope.component
   >>> import zope.viewlet
-  >>> import zope.app.component
+  >>> import zope.component
   >>> import zope.app.publisher.browser
   >>> import z3c.macro
   >>> import z3c.template
   >>> import z3c.formui
   >>> xmlconfig.XMLConfig('meta.zcml', zope.component)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.viewlet)()
-  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.component)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.app.publisher.browser)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.macro)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.template)()
@@ -47,7 +46,7 @@ Sample data setup
 
 Let's create a sample container which we can use as our iterable context:
 
-  >>> from zope.app.container import btree
+  >>> from zope.container import btree
   >>> class Container(btree.BTreeContainer):
   ...     """Sample container."""
   ...     __name__ = u'container'

src/z3c/tabular/tests.py

@@ -17,7 +17,7 @@
 __docformat__ = "reStructuredText"
 
 import unittest
-from zope.testing import doctest
+import doctest
 from zope.publisher.browser import TestRequest
 
 import z3c.testing