[Checkins] SVN: Products.CMFCore/trunk/ - removed last zope.app.testing dependency

[Yvo Schubbe]

Log message for revision 113481:
  - removed last zope.app.testing dependency

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_content.py
  U   Products.CMFCore/trunk/setup.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2010-06-15 10:33:16 UTC (rev 113480)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2010-06-15 12:14:13 UTC (rev 113481)
@@ -21,7 +21,7 @@
   are called in a context that does not contain the items they 
   import.
 
-- Added zope.app.testing as a testing dependency.
+- Removed zope.app.testing dependency.
 
 - Import BeforeTraverseEvent from new location if available.
 

Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_content.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_content.py	2010-06-15 10:33:16 UTC (rev 113480)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_content.py	2010-06-15 12:14:13 UTC (rev 113481)
@@ -43,7 +43,7 @@
         return SetupTool('portal_setup')
 
     def _setUpAdapters(self):
-        from zope.app.testing import ztapi
+        from zope.component import provideAdapter
         #from OFS.Image import File
 
         from Products.GenericSetup.interfaces import IFilesystemExporter
@@ -62,35 +62,29 @@
         #from Products.CMFCore.exportimport.content import \
         #        OFSFileAdapter
 
-        ztapi.provideAdapter(IFolderish,
-                             IFilesystemExporter,
-                             StructureFolderWalkingAdapter,
-                            )
+        provideAdapter(StructureFolderWalkingAdapter,
+                       (IFolderish,),
+                       IFilesystemExporter)
 
-        ztapi.provideAdapter(IFolderish,
-                             IFilesystemImporter,
-                             StructureFolderWalkingAdapter,
-                            )
+        provideAdapter(StructureFolderWalkingAdapter,
+                       (IFolderish,),
+                       IFilesystemImporter)
 
-        ztapi.provideAdapter(ICSVAware,
-                             IFilesystemExporter,
-                             CSVAwareFileAdapter,
-                            )
+        provideAdapter(CSVAwareFileAdapter,
+                       (ICSVAware,),
+                       IFilesystemExporter)
 
-        ztapi.provideAdapter(ICSVAware,
-                             IFilesystemImporter,
-                             CSVAwareFileAdapter,
-                            )
+        provideAdapter(CSVAwareFileAdapter,
+                       (ICSVAware,),
+                       IFilesystemImporter)
 
-        ztapi.provideAdapter(IINIAware,
-                             IFilesystemExporter,
-                             INIAwareFileAdapter,
-                            )
+        provideAdapter(INIAwareFileAdapter,
+                       (IINIAware,),
+                       IFilesystemExporter)
 
-        ztapi.provideAdapter(IINIAware,
-                             IFilesystemImporter,
-                             INIAwareFileAdapter,
-                            )
+        provideAdapter(INIAwareFileAdapter,
+                       (IINIAware,),
+                       IFilesystemImporter)
 
     def tearDown(self):
         cleanUp()

Modified: Products.CMFCore/trunk/setup.py
===================================================================
--- Products.CMFCore/trunk/setup.py	2010-06-15 10:33:16 UTC (rev 113480)
+++ Products.CMFCore/trunk/setup.py	2010-06-15 12:14:13 UTC (rev 113481)
@@ -52,12 +52,7 @@
           ],
       tests_require=[
           'zope.testing >= 3.7.0',
-          'zope.app.testing',
           ],
-      extras_require=dict(
-        test=[
-          'zope.app.testing',
-          ]),
       test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
       test_suite='Products.%s' % NAME,
       entry_points="""