[Checkins] SVN: grok/trunk/src/grok/ * add formlib.Fields to public API (cannot be

[Martijn Faassen]

Log message for revision 71346:
  * add formlib.Fields to public API (cannot be
    actually used yet; need to do a significant
    formlib integration refactoring first)
  * remove schema_fields from public API
  

Changed:
  U   grok/trunk/src/grok/__init__.py
  U   grok/trunk/src/grok/interfaces.py

-=-
Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2006-11-30 22:31:26 UTC (rev 71345)
+++ grok/trunk/src/grok/__init__.py	2006-11-30 22:48:08 UTC (rev 71346)
@@ -16,7 +16,7 @@
 
 from zope.interface import implements
 from zope.component import adapts
-from zope.formlib.form import action
+from zope.formlib.form import action, Fields
 from zope.event import notify
 from zope.app.component.hooks import getSite
 from zope.lifecycleevent import (
@@ -26,13 +26,13 @@
 
 from zope.app.container.contained import (
     IObjectAddedEvent, ObjectAddedEvent,
-    IObjectMovedEvent, ObjectMovedEvent, 
+    IObjectMovedEvent, ObjectMovedEvent,
     IObjectRemovedEvent, ObjectRemovedEvent,
     IContainerModifiedEvent, ContainerModifiedEvent)
 
 from grok.components import Model, Adapter, MultiAdapter, View, XMLRPC
 from grok.components import PageTemplate, Utility, Container, Traverser, Site
-from grok.components import EditForm, DisplayForm, schema_fields
+from grok.components import EditForm, DisplayForm
 from grok.directive import context, name, template, templatedir
 from grok._grok import do_grok as grok  # Avoid name clash within _grok
 from grok._grok import SubscribeDecorator as subscribe

Modified: grok/trunk/src/grok/interfaces.py
===================================================================
--- grok/trunk/src/grok/interfaces.py	2006-11-30 22:31:26 UTC (rev 71345)
+++ grok/trunk/src/grok/interfaces.py	2006-11-30 22:48:08 UTC (rev 71346)
@@ -125,13 +125,14 @@
 
     def getSite():
         """Get the current site."""
-        
+
     def PageTemplate(template):
         """Create a Grok PageTemplate object from ``template`` source
         text.  This can be used for inline PageTemplates."""
 
-    def schema_fields(class_):
-        """Return a list of schema fields defined for a model or view."""
+    def Fields(*args, **kw):
+        """Return a list of formlib fields based on interfaces and/or schema
+        fields."""
 
 class IGrokView(interface.Interface):
     """Grok views all provide this interface.
@@ -141,14 +142,14 @@
 
     def url(obj=None, name=None):
         """Construct URL.
-        
+
         If no arguments given, construct URL to view itself.
-    
+
         If only obj argument is given, construct URL to obj.
-        
+
         If only name is given as the first argument, construct URL
         to context/name.
-        
+
         If both object and name arguments are supplied, construct
         URL to obj/name.
         """