[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/testing/setup.py get rid of last two ztapi usages

[Philipp von Weitershausen]

Log message for revision 66633:
  get rid of last two ztapi usages
  unused import
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/app/testing/setup.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/testing/setup.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/testing/setup.py	2006-04-07 10:55:03 UTC (rev 66632)
+++ Zope3/branches/jim-adapter/src/zope/app/testing/setup.py	2006-04-07 11:13:18 UTC (rev 66633)
@@ -18,8 +18,6 @@
 import zope.component
 import zope.interface
 import zope.traversing.api
-from zope.interface import classImplements
-from zope.app.testing import ztapi
 
 import zope.deferredimport
 zope.deferredimport.deprecatedFrom(
@@ -40,8 +38,8 @@
 from zope.app.dependable import Dependable
 from zope.app.dependable.interfaces import IDependable
 def setUpDependable():
-    ztapi.provideAdapter(IAttributeAnnotatable, IDependable,
-                         Dependable)
+    zope.component.provideAdapter(Dependable, (IAttributeAnnotatable,),
+                                  IDependable)
 
 #------------------------------------------------------------------------
 # Traversal
@@ -60,7 +58,8 @@
 from zope.component.interfaces import IComponentLookup
 from zope.interface import Interface
 def setUpSiteManagerLookup():
-    ztapi.provideAdapter(Interface, IComponentLookup, SiteManagerAdapter)
+    zope.component.provideAdapter(SiteManagerAdapter, (Interface,),
+                                  IComponentLookup)
 
 #------------------------------------------------------------------------
 # Placeful setup