Use newer registration APIs.

component.py

@@ -61,14 +61,19 @@ def getRequiredAdapters(iface, withViews=False):
                 if iface.isOrExtends(required_iface):
                     yield reg
 
+def _adapterishRegistrations(registry):
+    for r in registry.registeredAdapters():
+        yield r
+    for r in registry.registeredSubscriptionAdapters():
+        yield r
+    for r in registry.registeredHandlers():
+        yield r
 
 def getProvidedAdapters(iface, withViews=False):
     """Get adapter registrations where this interface is provided."""
     gsm = zapi.getGlobalSiteManager()
-    for reg in gsm.registrations():
+    for reg in _adapterishRegistrations(gsm):
         # Only get adapters
-        if not isinstance(reg, (AdapterRegistration, SubscriptionRegistration)):
-            continue
         # Ignore adapters that have no required interfaces
         if len(reg.required) == 0:
             continue

presentation.py

@@ -121,9 +121,8 @@ def getPresentationType(iface):
 def getViews(iface, type=IRequest):
     """Get all view registrations for a particular interface."""
     gsm = zapi.getGlobalSiteManager()
-    for reg in gsm.registrations():
-        if (isinstance(reg, AdapterRegistration) and
-            len(reg.required) > 0 and
+    for reg in gsm.registeredAdapters():
+        if (len(reg.required) > 0 and
             reg.required[-1] is not None and
             reg.required[-1].isOrExtends(type)):
 

utilitymodule/utilitymodule.py

@@ -123,10 +123,9 @@ def items(self):
         sm = zope.component.getSiteManager()
         ifaces = {}
         while sm is not None:
-            for reg in sm.registrations():
-                if isinstance(reg, UtilityRegistration):
-                    path = getPythonPath(reg.provided)
-                    ifaces[path] = UtilityInterface(self, path, reg.provided)
+            for reg in sm.registeredUtilities():
+                path = getPythonPath(reg.provided)
+                ifaces[path] = UtilityInterface(self, path, reg.provided)
             sm = queryNextSiteManager(sm)
 
         items = ifaces.items()