[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Formulator - SimpleRegistry.py:1.1.2.3 Widget.py:1.1.2.3 formulator.zcml:1.1.2.2 metaConfigure.py:1.1.2.2

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Formulator
In directory cvs.zope.org:/tmp/cvs-serv4573

Modified Files:
      Tag: srichter-OFS_Formulator-branch
	SimpleRegistry.py Widget.py formulator.zcml metaConfigure.py 
Log Message:
Changes made to make theis merge with the latest 3x branch.

- DateTime initialization and test is fixed
- Various tests adjusted to new Publisher
- Added security ZCML commands due to incorporated ZPT security


=== Zope3/lib/python/Zope/App/Formulator/SimpleRegistry.py 1.1.2.2 => 1.1.2.3 ===
 from Zope.Configuration.name import resolve
 from ISimpleRegistry import ISimpleRegistry
-from Interface import implements
 from types import StringTypes, ListType, TupleType
 ListTypes = (TupleType, ListType)
 


=== Zope3/lib/python/Zope/App/Formulator/Widget.py 1.1.2.2 => 1.1.2.3 ===
 
 
-class Widget:
+class Widget(object):
     """I do not know what will be in this class, but it provides
     an extra layer.
     """


=== Zope3/lib/python/Zope/App/Formulator/formulator.zcml 1.1.2.1 => 1.1.2.2 ===
    xmlns='http://namespaces.zope.org/zope'
+   xmlns:security='http://namespaces.zope.org/security'
 >
 
-<include package="Zope.App.Formulator" file="formulator-meta.zcml" />
+  <include package="Zope.App.Formulator" file="formulator-meta.zcml" />
+
+  <include package="Zope.App.Formulator.Fields" file="fields.zcml" />
+  <include package="Zope.App.Formulator.Validators" file="validators.zcml" />
+  <include package="Zope.App.Formulator.Widgets" file="widgets.zcml" />
+
+  <adapter factory="Zope.App.Formulator.PropertyFieldAdapter."
+           provides="Zope.App.Formulator.IPropertyFieldAdapter."
+           for="Zope.App.Formulator.IField." />
+
+
+  <security:protectClass 
+    name=".Field."
+    permission_id="Zope.View" 
+    interface=".IField." />
+
+  <security:protectClass 
+    name=".Form."
+    permission_id="Zope.View" 
+    methods="index, action, getFieldViews, getContext" />
 
-<include package="Zope.App.Formulator.Fields" file="fields.zcml" />
-<include package="Zope.App.Formulator.Validators" file="validators.zcml" />
-<include package="Zope.App.Formulator.Widgets" file="widgets.zcml" />
-
-<adapter factory="Zope.App.Formulator.PropertyFieldAdapter."
-         provides="Zope.App.Formulator.IPropertyFieldAdapter."
-         for="Zope.App.Formulator.IField." />
 
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/Formulator/metaConfigure.py 1.1.2.1 => 1.1.2.2 ===
 """
 
-from Zope.Configuration.name import resolve
 from Zope.Configuration.Action import Action
 from FieldRegistry import registerField
 from ValidatorRegistry import registerValidator
 
-def field(name, field):
+def field(_context, name, field):
     """
     Note that most applications return an actual Action at this point;
     however, the field registry is requred during the startup, so we
     need to initialize it now.
     """
-    field = resolve(field)
+    field = _context.resolve(field)
     registerField(name, field)
     return []
 
 
-def validator(name, validator):
+def validator(_context, name, validator):
     """
     Note that most applications return an actual Action at this point;
     however, the validator registry is requred during the startup, so we
     need to initialize it now.
     """
-    validator = resolve(validator)
+    validator = _context.resolve(validator)
     registerValidator(name, validator)
     return []