[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/ Fix test errors (on Zope 2.12 only still)

[Wichert Akkerman]

Log message for revision 97526:
  Fix test errors (on Zope 2.12 only still)

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/zcml.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py	2009-03-05 11:50:36 UTC (rev 97525)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py	2009-03-05 12:03:32 UTC (rev 97526)
@@ -280,6 +280,7 @@
       ...       <genericsetup:upgradeDepends
       ...           title="Bar Upgrade dependency profile import steps"
       ...           description="Re-imports steps from the profile"
+      ...           import_profile="profile-Products.CMFDefault:default"
       ...           import_steps="baz bat"
       ...           run_deps="True"
       ...           purge="True"
@@ -316,6 +317,8 @@
       <function c_dummy_upgrade_handler at ...>
       >>> step2['title']
       u'Bar Upgrade Step 2'
+      >>> step3['step'].import_profile
+      u'profile-Products.CMFDefault:default'
       >>> step3['step'].import_steps
       [u'baz', u'bat']
       >>> step3['step'].run_deps

Modified: Products.GenericSetup/trunk/Products/GenericSetup/zcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/zcml.py	2009-03-05 11:50:36 UTC (rev 97525)
+++ Products.GenericSetup/trunk/Products/GenericSetup/zcml.py	2009-03-05 12:03:32 UTC (rev 97526)
@@ -263,8 +263,9 @@
         required=False,
         )
 
-    profile = zope.schema.TextLine(
-        title=u"GenericSetup profile id",
+    import_profile = zope.schema.TextLine(
+        title=u"GenericSetup profile id to load, if not the same as the "
+               u"current profile.",
         required=False)
 
     import_steps = zope.configuration.fields.Tokens(
@@ -299,14 +300,14 @@
         args = (step,),
         )
 
-def upgradeDepends(_context, title, profile, description, profile=None,
+def upgradeDepends(_context, title, profile, description, import_profile=None,
                    import_steps=[], source='*', destination='*',
                    run_deps=False, purge=False, checker=None, sortkey=0):
     step = UpgradeDepends(title, profile, source, destination, description,
-                          profile, import_steps, run_deps, purge, checker,
+                          import_profile, import_steps, run_deps, purge, checker,
                           sortkey)
     _context.action(
-        discriminator = ('upgradeDepends', source, destination, profile,
+        discriminator = ('upgradeDepends', source, destination, import_profile,
                          str(import_steps), checker, sortkey),
         callable = _registerUpgradeStep,
         args = (step,),
@@ -339,18 +340,18 @@
             args = (step, self.id),
             )
 
-    def upgradeDepends(self, _context, title, description=None, profile=None,
+    def upgradeDepends(self, _context, title, description=None, import_profile=None,
                        import_steps=[], run_deps=False, purge=False,
                        checker=None):
         """ nested upgradeDepends directive """
         step = UpgradeDepends(title, self.profile, self.source, self.dest,
-                              description, profile, import_steps, run_deps,
+                              description, import_profile, import_steps, run_deps,
                               purge, checker, self.sortkey)
         if self.id is None:
             self.id = str(abs(hash('%s%s%s%s' % (title, self.source, self.dest,
                                                  self.sortkey))))
         _context.action(
-            discriminator = ('upgradeDepends', self.source, self.dest, profile,
+            discriminator = ('upgradeDepends', self.source, self.dest, import_profile,
                              str(import_steps), self.sortkey),
             callable = _registerNestedUpgradeStep,
             args = (step, self.id)