[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/ Drop support for the import step version

[Wichert Akkerman]

Log message for revision 81762:
  Drop support for the import step version

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	2007-11-12 08:50:10 UTC (rev 81761)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py	2007-11-12 08:56:06 UTC (rev 81762)
@@ -258,8 +258,7 @@
                                  name="name"
                                  title="title"
                                  description="description"
-                                 handler="Products.GenericSetup.tests.test_zcml.dummy_importstep_handler"
-                                 version="version">
+                                 handler="Products.GenericSetup.tests.test_zcml.dummy_importstep_handler">
                              </genericsetup:importStep>
                             </configure>""")
         from Products.GenericSetup.zcml import _import_step_regs
@@ -269,7 +268,6 @@
         self.assertEqual(data["handler"],
                 'Products.GenericSetup.tests.test_zcml.dummy_importstep_handler')
         self.assertEqual(data["description"], u"description")
-        self.assertEqual(data["version"], u"version")
         self.assertEqual(data["title"], u"title")
         self.assertEqual(data["dependencies"], ())
         self.assertEqual(data["id"], u"name")
@@ -283,8 +281,7 @@
                                  name="name"
                                  title="title"
                                  description="description"
-                                 handler="Products.GenericSetup.tests.test_zcml.dummy_importstep_handler"
-                                 version="version">
+                                 handler="Products.GenericSetup.tests.test_zcml.dummy_importstep_handler">
                                 <depends name="something.else"/>
                              </genericsetup:importStep>
                             </configure>""")

Modified: Products.GenericSetup/trunk/Products/GenericSetup/zcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/zcml.py	2007-11-12 08:50:10 UTC (rev 81761)
+++ Products.GenericSetup/trunk/Products/GenericSetup/zcml.py	2007-11-12 08:56:06 UTC (rev 81762)
@@ -147,10 +147,6 @@
         description=u'',
         required=True)
 
-    version = MessageID(
-        title=u'Version',
-        description=u'',
-        required=True)
 
 class IImportStepDependsDirective(Interface):
     name = PythonIdentifier(
@@ -161,13 +157,12 @@
 _import_step_regs = []
 
 class importStep:
-    def __init__(self, context, name, version, title, description, handler):
+    def __init__(self, context, name, title, description, handler):
         """ Add a new import step to the registry.
         """
         self.context=context
         self.discriminator = ('importStep', name),
         self.name=name
-        self.version=version
         self.handler=handler
         self.title=title
         self.description=description
@@ -185,7 +180,7 @@
         self.context.action(
             discriminator = self.discriminator,
             callable = _import_step_registry.registerStep,
-            args = (self.name, self.version, self.handler, self.dependencies,
+            args = (self.name, None, self.handler, self.dependencies,
                         self.title, self.description),
             )