[Checkins] SVN: zc.table/trunk/ Remove zope.app.testing and zope.testing from dependencies

[Marius Gedminas]

Log message for revision 124788:
  Remove zope.app.testing and zope.testing from dependencies
  

Changed:
  U   zc.table/trunk/CHANGES.txt
  U   zc.table/trunk/buildout.cfg
  U   zc.table/trunk/setup.py
  U   zc.table/trunk/src/zc/table/testing.py
  U   zc.table/trunk/src/zc/table/tests.py

-=-
Modified: zc.table/trunk/CHANGES.txt
===================================================================
--- zc.table/trunk/CHANGES.txt	2012-03-29 06:45:32 UTC (rev 124787)
+++ zc.table/trunk/CHANGES.txt	2012-03-29 13:17:03 UTC (rev 124788)
@@ -9,7 +9,11 @@
 
 - Removed deprecated slugs for ZPKG and ZCML.
 
+- Removed dependency on ``zope.app.testing``.
 
+- Move ``zope.testing`` to test extra.
+
+
 0.8.1 (2010-05-25)
 ------------------
 

Modified: zc.table/trunk/buildout.cfg
===================================================================
--- zc.table/trunk/buildout.cfg	2012-03-29 06:45:32 UTC (rev 124787)
+++ zc.table/trunk/buildout.cfg	2012-03-29 13:17:03 UTC (rev 124788)
@@ -4,5 +4,4 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zc.table
-extra-paths = parts/zope3/src
+eggs = zc.table [test]

Modified: zc.table/trunk/setup.py
===================================================================
--- zc.table/trunk/setup.py	2012-03-29 06:45:32 UTC (rev 124787)
+++ zc.table/trunk/setup.py	2012-03-29 13:17:03 UTC (rev 124788)
@@ -8,15 +8,14 @@
         'setuptools',
         'zc.resourcelibrary >= 0.6',
         'zope.app.form',
-        'zope.app.testing',
         'zope.cachedescriptors',
         'zope.component',
         'zope.formlib',
         'zope.i18n',
         'zope.interface',
         'zope.schema',
-        'zope.testing',
     ],
+    extras_require=dict(test=['zope.testing']),
     packages=find_packages('src'),
     package_dir= {'':'src'},
 

Modified: zc.table/trunk/src/zc/table/testing.py
===================================================================
--- zc.table/trunk/src/zc/table/testing.py	2012-03-29 06:45:32 UTC (rev 124787)
+++ zc.table/trunk/src/zc/table/testing.py	2012-03-29 13:17:03 UTC (rev 124788)
@@ -16,7 +16,6 @@
 $Id: testing.py 2520 2005-06-27 21:26:18Z benji $
 """
 from zope import interface, component
-from zope.app.testing import ztapi
 import zc.table.interfaces
 import zc.table.table
 
@@ -26,10 +25,11 @@
 
 
 def setUp(test):
-    ztapi.provideUtility(zc.table.interfaces.IFormatterFactory, 
-                         SimpleFormatter)
+    gsm = component.getGlobalSiteManager()
+    gsm.registerUtility(SimpleFormatter, zc.table.interfaces.IFormatterFactory)
     assert component.getUtility(zc.table.interfaces.IFormatterFactory) != None
-    
 
+
 def tearDown(test):
-    ztapi.unprovideUtility(zc.table.interfaces.IFormatterFactory)
+    gsm = component.getGlobalSiteManager()
+    gsm.unregisterUtility(provided=zc.table.interfaces.IFormatterFactory)

Modified: zc.table/trunk/src/zc/table/tests.py
===================================================================
--- zc.table/trunk/src/zc/table/tests.py	2012-03-29 06:45:32 UTC (rev 124787)
+++ zc.table/trunk/src/zc/table/tests.py	2012-03-29 13:17:03 UTC (rev 124788)
@@ -17,14 +17,14 @@
 """
 import unittest
 from zope import component
-from zope.app.testing import placelesssetup
+from zope.component.testing import setUp, tearDown
 import zope.publisher.interfaces.browser
 import zope.schema.interfaces
 import zope.app.form.browser
 
 
 def columnSetUp(test):
-    placelesssetup.setUp(test)
+    setUp(test)
     component.provideAdapter(
         zope.app.form.browser.TextWidget,
         (zope.schema.interfaces.ITextLine,
@@ -73,12 +73,12 @@
             ),
         doctest.DocFileSuite(
             'column.txt',
-            setUp = columnSetUp, tearDown=placelesssetup.tearDown,
+            setUp=columnSetUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
             ),
         doctest.DocFileSuite(
             'fieldcolumn.txt',
-            setUp = fieldColumnSetUp, tearDown=placelesssetup.tearDown,
+            setUp=fieldColumnSetUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
             ),
         ))