[Zope3-checkins] CVS: Zope3/src/zope/app/adapter - adapter.py:1.11

[Stephan Richter]

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

Modified Files:
	adapter.py 
Log Message:


Interchanged PerissionField and InterfaceField with Choice and Sequence.




=== Zope3/src/zope/app/adapter/adapter.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/adapter/adapter.py:1.10	Fri Apr 23 09:43:33 2004
+++ Zope3/src/zope/app/adapter/adapter.py	Sat Apr 24 19:17:56 2004
@@ -24,12 +24,10 @@
 from zope.interface.adapter import adapterImplied, Default
 from zope.interface.adapter import Surrogate, AdapterRegistry
 import sys
-import zope.app.component.interfacefield
 import zope.app.component.nextservice
 import zope.app.container.contained
 import zope.app.registration.interfaces
 import zope.app.site.interfaces
-import zope.app.security.permission
 import zope.app.registration
 import zope.component.interfaces
 import zope.component.adapter
@@ -276,19 +274,18 @@
 class IAdapterRegistration(
     zope.app.registration.interfaces.IRegistration):
 
-    required = zope.app.component.interfacefield.InterfaceField(
+    required = zope.schema.Choice(
         title = _(u"For interface"),
         description = _(u"The interface of the objects being adapted"),
-        readonly = True,
-        basetype = None,
-        )
+        vocabulary="Interfaces",
+        readonly = True)
 
-    provided = zope.app.component.interfacefield.InterfaceField(
+    provided = zope.schema.Choice(
         title = _(u"Provided interface"),
         description = _(u"The interface provided"),
+        vocabulary="Interfaces",
         readonly = True,
-        required = True,
-        )
+        required = True)
 
     name = zope.schema.TextLine(
         title=_(u"Name"),
@@ -302,8 +299,9 @@
         required = True,
         )
 
-    permission = zope.app.security.permission.PermissionField(
+    permission = zope.schema.Choice(
         title=_(u"The permission required for use"),
+        vocabulary="Permissions",
         readonly=False,
         required=False,
         )