[Checkins] SVN: zope.app.zopeappgenerations/trunk/ Fixed evolve3 that used no longer existing API.

[Gediminas Paulauskas]

Log message for revision 118855:
  Fixed evolve3 that used no longer existing API.
  
  Merge fixes from 3.5 branch
  

Changed:
  U   zope.app.zopeappgenerations/trunk/CHANGES.txt
  U   zope.app.zopeappgenerations/trunk/bootstrap.py
  U   zope.app.zopeappgenerations/trunk/setup.py
  U   zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/__init__.py
  U   zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve2.py
  U   zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve3.py
  U   zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve4.py
  U   zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve5.py

-=-
Modified: zope.app.zopeappgenerations/trunk/CHANGES.txt
===================================================================
--- zope.app.zopeappgenerations/trunk/CHANGES.txt	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/CHANGES.txt	2010-12-13 19:17:54 UTC (rev 118855)
@@ -5,7 +5,7 @@
 3.6.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fixed evolve3 that used no longer existing API.
 
 
 3.6.0 (2010-09-18)

Modified: zope.app.zopeappgenerations/trunk/bootstrap.py
===================================================================
--- zope.app.zopeappgenerations/trunk/bootstrap.py	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/bootstrap.py	2010-12-13 19:17:54 UTC (rev 118855)
@@ -16,8 +16,6 @@
 Simply run this script in a directory containing a buildout.cfg.
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
-
-$Id$
 """
 
 import os, shutil, sys, tempfile, urllib2

Modified: zope.app.zopeappgenerations/trunk/setup.py
===================================================================
--- zope.app.zopeappgenerations/trunk/setup.py	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/setup.py	2010-12-13 19:17:54 UTC (rev 118855)
@@ -17,8 +17,6 @@
 # Zope Toolkit policies as described by this documentation.
 ##############################################################################
 """Setup for zope.app.zopeappgenerations package
-
-$Id$
 """
 import os
 from setuptools import setup, find_packages
@@ -28,7 +26,7 @@
 
 setup(name='zope.app.zopeappgenerations',
       version='3.6.1dev',
-      author='Zope Corporation and Contributors',
+      author='Zope Foundation and Contributors',
       author_email='zope-dev at zope.org',
       description='Zope Application ZODB Update Generations',
       long_description=(

Modified: zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/__init__.py
===================================================================
--- zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/__init__.py	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/__init__.py	2010-12-13 19:17:54 UTC (rev 118855)
@@ -12,8 +12,6 @@
 #
 ##############################################################################
 """Zope Application Server Generations
-
-$Id$
 """
 __docformat__ = "reStructuredText"
 

Modified: zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve2.py
===================================================================
--- zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve2.py	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve2.py	2010-12-13 19:17:54 UTC (rev 118855)
@@ -12,18 +12,14 @@
 #
 ##############################################################################
 """Evolve the ZODB from Zope 3.1 to a Zope 3.2 compatible format.
-
-$Id$
 """
 __docformat__ = "reStructuredText"
 
 from zope.app.authentication.principalfolder import IInternalPrincipal
 from zope.app.component.interfaces import ISite
-from zope.app.zopeappgenerations import getRootFolder
+from zope.generations.utility import findObjectsProviding, getRootFolder
 
-from zope.generations.utility import findObjectsProviding
 
-
 generation = 2
 
 def evolve(context):

Modified: zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve3.py
===================================================================
--- zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve3.py	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve3.py	2010-12-13 19:17:54 UTC (rev 118855)
@@ -14,22 +14,15 @@
 """Evolve existing PAU group folders.
 
 They should be used as contained plugins rather than registered plugins.
-
-$Id$
 """
 __docformat__ = "reStructuredText"
 
-from zope import component
-
-from zope.app.component.interfaces import ISite
-from zope.app.zopeappgenerations import getRootFolder
-
-from zope.generations.utility import findObjectsProviding
-
-from zope.app.component import registration
 import zope.app.authentication.interfaces
 from zope.app.authentication import groupfolder
+from zope.app.component.interfaces import ISite
+from zope.component import getUtilitiesFor
 from zope.copypastemove.interfaces import IObjectMover
+from zope.generations.utility import findObjectsProviding, getRootFolder
 
 generation = 3
 
@@ -50,7 +43,7 @@
         sm = site.getSiteManager()
         for pau in findObjectsProviding(
             sm, zope.app.authentication.interfaces.IPluggableAuthentication):
-            for nm, util in component.getUtilitiesFor(
+            for nm, util in getUtilitiesFor(
                 zope.app.authentication.interfaces.IAuthenticatorPlugin,
                 context=pau):
                 if groupfolder.IGroupFolder.providedBy(util):
@@ -60,7 +53,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 +63,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)

Modified: zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve4.py
===================================================================
--- zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve4.py	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve4.py	2010-12-13 19:17:54 UTC (rev 118855)
@@ -12,14 +12,11 @@
 #
 ##############################################################################
 """Evolve local site managers
-
-$Id$
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.zopeappgenerations import getRootFolder
+from zope.app.generations.utility import getRootFolder
 
 def evolve(context):
     getRootFolder(context).getSiteManager()._evolve_to_generation_4()
 
-    

Modified: zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve5.py
===================================================================
--- zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve5.py	2010-12-13 19:01:59 UTC (rev 118854)
+++ zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations/evolve5.py	2010-12-13 19:17:54 UTC (rev 118855)
@@ -12,16 +12,13 @@
 #
 ##############################################################################
 """Evolve moved Zope Dublin Core Annotatable data
-
-$Id$
 """
 __docformat__ = "reStructuredText"
 from zope.annotation.interfaces import IAnnotatable, IAnnotations
 from zope.dublincore.interfaces import IWriteZopeDublinCore
 from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
 from zope.dublincore.annotatableadapter import DCkey
-from zope.generations.utility import findObjectsProviding
-from zope.app.zopeappgenerations import getRootFolder
+from zope.generations.utility import findObjectsProviding, getRootFolder
 
 generation = 5