Fixed evolve3 that used no longer existing zope.app.component API.

zopefoundation · Dec 13, 2010 · d3fa6b3 · d3fa6b3
1 parent 9be79e3
commit d3fa6b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,7 +5,7 @@ CHANGES
 3.5.1 (unreleased)
 ------------------
 
-- ...
+- Fixed evolve3 that used no longer existing API.
 
 
 3.5.0 (2009-04-05)

diff --git a/src/zope/app/zopeappgenerations/evolve2.py b/src/zope/app/zopeappgenerations/evolve2.py
@@ -19,9 +19,7 @@
 
 from zope.app.authentication.principalfolder import IInternalPrincipal
 from zope.app.component.interfaces import ISite
-from zope.app.zopeappgenerations import getRootFolder
-
-from zope.app.generations.utility import findObjectsProviding
+from zope.app.generations.utility import findObjectsProviding, getRootFolder
 
 
 generation = 2

diff --git a/src/zope/app/zopeappgenerations/evolve3.py b/src/zope/app/zopeappgenerations/evolve3.py
@@ -22,13 +22,10 @@
 from zope import component
 
 from zope.app.component.interfaces import ISite
-from zope.app.zopeappgenerations import getRootFolder
 
-from zope.app.generations.utility import findObjectsProviding
-
-from zope.app.component import registration
 import zope.app.authentication.interfaces
 from zope.app.authentication import groupfolder
+from zope.app.generations.utility import findObjectsProviding, getRootFolder
 from zope.copypastemove.interfaces import IObjectMover
 
 generation = 3
@@ -60,7 +57,8 @@ def evolve(context):
                             "each group folder should only be within the "
                             "Pluggable Authentication utility that uses it")
                     # we need to remove this registration
-                    regs = registration.Registered(util).registrations()
+                    regs = [r for r in sm.registeredUtilities()
+                            if r.component == util]
                     if len(regs) != 1:
                         raise RuntimeError(
                             "I don't know how to migrate your database: "
@@ -69,7 +67,7 @@ def evolve(context):
                             "like it's registered for something additional "
                             "that I don't expect")
                     r = regs[0]
-                    r.registry.unregisterUtility(
+                    sm.unregisterUtility(
                        util,
                        zope.app.authentication.interfaces.IAuthenticatorPlugin,
                        nm)