[Checkins] SVN: Zope3/branches/3.3/src/zope/app/ removed prematurely committed changes

[Jim Fulton]

Log message for revision 69309:
  removed prematurely committed changes

Changed:
  U   Zope3/branches/3.3/src/zope/app/component/back35.py
  U   Zope3/branches/3.3/src/zope/app/zopeappgenerations/evolve3.py

-=-
Modified: Zope3/branches/3.3/src/zope/app/component/back35.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/component/back35.py	2006-07-31 15:47:54 UTC (rev 69308)
+++ Zope3/branches/3.3/src/zope/app/component/back35.py	2006-07-31 15:50:22 UTC (rev 69309)
@@ -25,7 +25,6 @@
 
 from persistent import Persistent
 
-from zope import component
 import zope.cachedescriptors.property
 import zope.event
 import zope.schema
@@ -533,6 +532,7 @@
     # See zope.app.component.interfaces.registration.IComponentRegistration
     interface = None
 
+
 class Registered:
     """An adapter from IRegisterable to IRegistered.
 
@@ -546,12 +546,10 @@
         self.registerable = registerable
 
     def registrations(self):
-        context = self.registerable
-        return [
-            r
-            for r in component.getSiteManager(context).registeredUtilities()
-            if r.component == context
-            ]
+        rm = zapi.getParent(self.registerable).registrationManager
+        return [reg for reg in rm.values()
+                if (IComponentRegistration.providedBy(reg) and
+                    reg.component is self.registerable)]
 
 
 class RegistrationManager(BTreeContainer):
@@ -851,10 +849,6 @@
     def __setitem__(self, k, v):
         self.update([(k, v)])
 
-    def __delitem__(self, k):
-        self.update(())
-        del getattr(self.site, self.__name__)[k]
-
 class _OldAdapterRegistrations(_OldUtilityRegistrations):
 
     def _getOldRegistrations(self):

Modified: Zope3/branches/3.3/src/zope/app/zopeappgenerations/evolve3.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/zopeappgenerations/evolve3.py	2006-07-31 15:47:54 UTC (rev 69308)
+++ Zope3/branches/3.3/src/zope/app/zopeappgenerations/evolve3.py	2006-07-31 15:50:22 UTC (rev 69309)
@@ -69,10 +69,7 @@
                             "like it's registered for something additional "
                             "that I don't expect")
                     r = regs[0]
-                    r.registry.unregisterUtility(
-                       util,
-                       zope.app.authentication.interfaces.IAuthenticatorPlugin,
-                       nm)
+                    r.getRegistry().unregister(r)
                     if r.name in pau.authenticatorPlugins:
                         if util.__name__ != r.name: # else no-op
                             plugins = list(pau.authenticatorPlugins)