Import getAllUtilitiesRegisteredFor directly from zope.component and

remove dependency on zope.app.zapi.

svn path=/five.intid/trunk/; revision=226233

docs/HISTORY.txt

@@ -4,6 +4,10 @@ Changelog
 0.5.2 - unreleased
 ------------------
 
+- Import getAllUtilitiesRegisteredFor directly from zope.component and
+  remove dependency on zope.app.zapi.
+  [Arfrever]
+
 - Fix chameleon template error.
 
 0.5.1 - August 4, 2010

five/intid/intid.py

@@ -5,7 +5,7 @@
     from Globals import InitializeClass
 from persistent import Persistent
 from Acquisition import Explicit
-from zope.app import zapi
+from zope.component import getAllUtilitiesRegisteredFor
 from zope.intid import IntIds as z3IntIds
 from zope.intid.interfaces import IIntIds
 from zope.intid.interfaces import IntIdAddedEvent, IntIdRemovedEvent
@@ -72,7 +72,7 @@ def addIntIdSubscriber(ob, event):
     Registers the object added in all unique id utilities and fires
     an event for the catalogs.
     """
-    utilities = tuple(zapi.getAllUtilitiesRegisteredFor(IIntIds))
+    utilities = tuple(getAllUtilitiesRegisteredFor(IIntIds))
     if utilities: # assert that there are any utilites
         key = None
         try:
@@ -93,7 +93,7 @@ def removeIntIdSubscriber(ob, event):
     Removes the unique ids registered for the object in all the unique
     id utilities.
     """
-    utilities = tuple(zapi.getAllUtilitiesRegisteredFor(IIntIds))
+    utilities = tuple(getAllUtilitiesRegisteredFor(IIntIds))
     if utilities:
         key = None
         try:
@@ -121,7 +121,7 @@ def moveIntIdSubscriber(ob, event):
     if IObjectRemovedEvent.providedBy(event) or \
            IObjectAddedEvent.providedBy(event):
         return
-    utilities = tuple(zapi.getAllUtilitiesRegisteredFor(IIntIds))
+    utilities = tuple(getAllUtilitiesRegisteredFor(IIntIds))
     if utilities:
         key = None
         try:

setup.py

@@ -23,7 +23,6 @@
         'setuptools',
         'zope.intid',
         'zope.app.intid',
-        'zope.app.zapi',
         'zope.component',
         'zope.event',
         'zope.interface',