[Checkins] SVN: zope.intid/trunk/ Use the zope.component API in favor of ztapi.

[Hanno Schlichting]

Log message for revision 107118:
  Use the zope.component API in favor of ztapi.
  

Changed:
  U   zope.intid/trunk/CHANGES.txt
  U   zope.intid/trunk/src/zope/intid/tests.py

-=-
Modified: zope.intid/trunk/CHANGES.txt
===================================================================
--- zope.intid/trunk/CHANGES.txt	2009-12-26 17:36:06 UTC (rev 107117)
+++ zope.intid/trunk/CHANGES.txt	2009-12-26 17:42:07 UTC (rev 107118)
@@ -5,7 +5,7 @@
 3.7.2 (unreleased)
 ------------------
 
-- No changes yet
+- Use the zope.component API in favor of ztapi.
 
 3.7.1 (2009-05-18)
 ------------------

Modified: zope.intid/trunk/src/zope/intid/tests.py
===================================================================
--- zope.intid/trunk/src/zope/intid/tests.py	2009-12-26 17:36:06 UTC (rev 107117)
+++ zope.intid/trunk/src/zope/intid/tests.py	2009-12-26 17:42:07 UTC (rev 107118)
@@ -20,9 +20,11 @@
 import BTrees
 from persistent import Persistent
 from persistent.interfaces import IPersistent
-from zope.app.testing import setup, ztapi
+from zope.app.testing import setup
 from ZODB.interfaces import IConnection
 from zope.component import getSiteManager
+from zope.component import provideAdapter
+from zope.component import provideHandler
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 from zope.keyreference.persistent import KeyReferenceToPersistent
@@ -56,9 +58,9 @@
     """Registers adapters ILocation->IConnection and IPersistent->IReference"""
     def setUp(self):
         self.root = setup.placefulSetUp(site=True)
-        ztapi.provideAdapter(IPersistent, IConnection, connectionOfPersistent)
-        ztapi.provideAdapter(IPersistent, IKeyReference,
-                             KeyReferenceToPersistent)
+        provideAdapter(connectionOfPersistent, (IPersistent, ), IConnection)
+        provideAdapter(
+            KeyReferenceToPersistent, (IPersistent, ), IKeyReference)
 
     def tearDown(self):
         setup.placefulTearDown()
@@ -178,8 +180,7 @@
 class TestSubscribers(ReferenceSetupMixin, unittest.TestCase):
 
     def setUp(self):
-        from zope.site.folder import Folder, rootFolder
-        from zope.component import provideHandler
+        from zope.site.folder import Folder
 
         ReferenceSetupMixin.setUp(self)
 
@@ -214,8 +215,8 @@
         def appendObjectEvent(obj, event):
             objevents.append((obj, event))
 
-        ztapi.subscribe([IIntIdRemovedEvent], None, events.append)
-        ztapi.subscribe([IFolder, IIntIdRemovedEvent], None, appendObjectEvent)
+        provideHandler(events.append, [IIntIdRemovedEvent])
+        provideHandler(appendObjectEvent, [IFolder, IIntIdRemovedEvent])
 
         # This should unregister the object in all utilities, not just the
         # nearest one.
@@ -248,8 +249,8 @@
         def appendObjectEvent(obj, event):
             objevents.append((obj, event))
 
-        ztapi.subscribe([IIntIdAddedEvent], None, events.append)
-        ztapi.subscribe([IFolder, IIntIdAddedEvent], None, appendObjectEvent)
+        provideHandler(events.append, [IIntIdAddedEvent])
+        provideHandler(appendObjectEvent, [IFolder, IIntIdAddedEvent])
 
         # This should register the object in all utilities, not just the
         # nearest one.