[Checkins] SVN: zope.app.zopeappgenerations/branches/3.5/ Fixed evolve3 that used no longer existing zope.app.component API.
Gediminas Paulauskas
menesis at pov.lt
Mon Dec 13 13:27:14 EST 2010
Log message for revision 118853:
Fixed evolve3 that used no longer existing zope.app.component API.
Changed:
U zope.app.zopeappgenerations/branches/3.5/CHANGES.txt
U zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve2.py
U zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve3.py
-=-
Modified: zope.app.zopeappgenerations/branches/3.5/CHANGES.txt
===================================================================
--- zope.app.zopeappgenerations/branches/3.5/CHANGES.txt 2010-12-13 15:28:49 UTC (rev 118852)
+++ zope.app.zopeappgenerations/branches/3.5/CHANGES.txt 2010-12-13 18:27:13 UTC (rev 118853)
@@ -5,7 +5,7 @@
3.5.1 (unreleased)
------------------
-- ...
+- Fixed evolve3 that used no longer existing API.
3.5.0 (2009-04-05)
Modified: zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve2.py
===================================================================
--- zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve2.py 2010-12-13 15:28:49 UTC (rev 118852)
+++ zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve2.py 2010-12-13 18:27:13 UTC (rev 118853)
@@ -19,11 +19,9 @@
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, getRootFolder
-from zope.app.generations.utility import findObjectsProviding
-
generation = 2
def evolve(context):
Modified: zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve3.py
===================================================================
--- zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve3.py 2010-12-13 15:28:49 UTC (rev 118852)
+++ zope.app.zopeappgenerations/branches/3.5/src/zope/app/zopeappgenerations/evolve3.py 2010-12-13 18:27:13 UTC (rev 118853)
@@ -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 @@
"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 @@
"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)
More information about the checkins
mailing list