[Zope3-checkins] SVN: Zope3/branches/3.3/ Merge from 3.2 branch (I had almost forgotten about it):

[Philipp von Weitershausen]

Log message for revision 69417:
  Merge from 3.2 branch (I had almost forgotten about it):
   Log message for revision 69301:
    Fix #681: IFormFields is missing declaration for omit()
  

Changed:
  U   Zope3/branches/3.3/doc/CHANGES.txt
  U   Zope3/branches/3.3/src/zope/formlib/form.py
  U   Zope3/branches/3.3/src/zope/formlib/interfaces.py

-=-
Modified: Zope3/branches/3.3/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.3/doc/CHANGES.txt	2006-08-12 10:03:57 UTC (rev 69416)
+++ Zope3/branches/3.3/doc/CHANGES.txt	2006-08-12 10:33:10 UTC (rev 69417)
@@ -10,6 +10,8 @@
 
     Bugfixes
 
+      - Fixed issue 681: IFormFields is missing declaration for omit()
+
       - Fixed issue 540, Fix documentation buglet in the zope.app.demo
         package (which is not shipped in the tarball).
 

Modified: Zope3/branches/3.3/src/zope/formlib/form.py
===================================================================
--- Zope3/branches/3.3/src/zope/formlib/form.py	2006-08-12 10:03:57 UTC (rev 69416)
+++ Zope3/branches/3.3/src/zope/formlib/form.py	2006-08-12 10:33:10 UTC (rev 69417)
@@ -148,7 +148,7 @@
         return self.__class__(*[self[name] for name in names])
 
     def omit(self, *names):
-        """Return a modified instance with an ordered subset of fields."""
+        """Return a modified instance omitting given fields."""
         return self.__class__(*[ff for ff in self if ff.__name__ not in names])
 
 Fields = FormFields

Modified: Zope3/branches/3.3/src/zope/formlib/interfaces.py
===================================================================
--- Zope3/branches/3.3/src/zope/formlib/interfaces.py	2006-08-12 10:03:57 UTC (rev 69416)
+++ Zope3/branches/3.3/src/zope/formlib/interfaces.py	2006-08-12 10:33:10 UTC (rev 69417)
@@ -515,6 +515,10 @@
         IFormFields that has the named fields in the specified order.
         """
 
+    def omit(*names):
+        """Omit fields with given names
+        """
+
 SKIP_UNAUTHORIZED = 2
 DISPLAY_UNWRITEABLE = 4