[Zope3-checkins] CVS: Zope3/src/zope/app/schemacontent/browser - __init__.py:1.6

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/schemacontent/browser
In directory cvs.zope.org:/tmp/cvs-serv29065/src/zope/app/schemacontent/browser

Modified Files:
	__init__.py 
Log Message:


Interchanged PerissionField and InterfaceField with Choice and Sequence.




=== Zope3/src/zope/app/schemacontent/browser/__init__.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/schemacontent/browser/__init__.py:1.5	Sat Apr 17 10:33:35 2004
+++ Zope3/src/zope/app/schemacontent/browser/__init__.py	Sat Apr 24 19:17:59 2004
@@ -23,13 +23,12 @@
 from zope.app.form.utility import setUpWidget
 from zope.app.form.interfaces import IInputWidget
 from zope.app.schemacontent.interfaces import IContentComponentDefinition
-from zope.app.security.permission import PermissionField
 from zope.app.servicenames import Utilities
 from zope.app.schemacontent.content import ContentComponentInstance
 from zope.component.exceptions import ComponentLookupError
 from zope.interface import implements
 from zope.publisher.interfaces import IPublishTraverse
-from zope.schema import getFieldsInOrder
+from zope.schema import getFieldsInOrder, Choice
 from zope.security.checker import CheckerPublic
 from zope.security.proxy import trustedRemoveSecurityProxy
 
@@ -49,19 +48,21 @@
                 get_perm, set_perm = None, None
 
             # Create the Accessor Permission Widget for this field
-            permField = PermissionField(
+            permField = Choice(
                 __name__=name+'_get_perm',
                 title=u"Accessor Permission",
                 default=CheckerPublic,
+                vocabulary="Permissions",
                 required=False)
             setUpWidget(self, name+'_get_perm', permField, IInputWidget,
                         value=get_perm)
 
             # Create the Mutator Permission Widget for this field
-            permField = PermissionField(
+            permField = Choice(
                 __name__=name+'_set_perm',
                 title=u"Mutator Permission",
                 default=CheckerPublic,
+                vocabulary="Permissions",
                 required=False)
             setUpWidget(self, name+'_set_perm', permField, IInputWidget,
                         value=set_perm)