[Checkins] SVN: zope.app.form/trunk/ - Depending on zope.schema>=3.5a1 which uses the builtin ``set`` instead of the

[Christian Zagrodnick]

Log message for revision 93357:
  - Depending on zope.schema>=3.5a1 which uses the builtin ``set`` instead of the
    ``sets`` module.
    
  Not backporting to 3.6 since I think 3.6 should work with zope.schema 3.4,
  correct me if I'm wrong.
  
  

Changed:
  U   zope.app.form/trunk/CHANGES.txt
  U   zope.app.form/trunk/setup.py
  U   zope.app.form/trunk/src/zope/app/form/browser/source.txt
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py

-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt	2008-11-25 23:55:23 UTC (rev 93356)
+++ zope.app.form/trunk/CHANGES.txt	2008-11-26 09:30:59 UTC (rev 93357)
@@ -5,7 +5,8 @@
 3.7.0 (unreleased)
 ==================
 
-- ...
+- Depending on zope.schema>=3.5a1 which uses the builtin ``set`` instead of the
+  ``sets`` module.
 
 3.6.3 (2008-10-15)
 ==================

Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py	2008-11-25 23:55:23 UTC (rev 93356)
+++ zope.app.form/trunk/setup.py	2008-11-26 09:30:59 UTC (rev 93357)
@@ -77,7 +77,7 @@
           "zope.interface",
           "zope.proxy",
           "zope.publisher",
-          "zope.schema",
+          "zope.schema>=3.5a1",
           "zope.security",
           "zope.app.basicskin",
           "zope.location",

Modified: zope.app.form/trunk/src/zope/app/form/browser/source.txt
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/source.txt	2008-11-25 23:55:23 UTC (rev 93356)
+++ zope.app.form/trunk/src/zope/app/form/browser/source.txt	2008-11-26 09:30:59 UTC (rev 93357)
@@ -463,13 +463,13 @@
   >>> request.form['field.dogSet-empty-marker'] = '1'
   >>> request.form['field.dogSet'] = ['bGFzc2ll']
   >>> widget.getInputValue()
-  Set(['lassie'])
+  set(['lassie'])
 
 Select two items::
 
   >>> request.form['field.dogSet'] = ['c3BvdA==', 'bGFzc2ll']
   >>> widget.getInputValue()
-  Set(['spot', 'lassie'])
+  set(['spot', 'lassie'])
 
 The rendered widget (still with the two items selected) looks like this::
 

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py	2008-11-25 23:55:23 UTC (rev 93356)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py	2008-11-26 09:30:59 UTC (rev 93357)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-import sets
 import unittest
 
 from zope.interface import Interface, implements
@@ -484,10 +483,10 @@
         self._field = ICollector.get('letters')
         widget = self._makeWidget(form={'field.letters-empty-marker': '1'})
         widget.setPrefix('field.')
-        self.assertEqual(widget.getInputValue(), sets.Set())
+        self.assertEqual(widget.getInputValue(), set([]))
         widget = self._makeWidget(form={'field.letters': ['token2', 'token3']})
         widget.setPrefix('field.')
-        self.assertEqual(widget.getInputValue(), sets.Set(['two', 'three']))
+        self.assertEqual(widget.getInputValue(), set(['two', 'three']))
 
         self._field = ICollector.get('frozenLetters')
         widget = self._makeWidget(form={'field.frozenLetters-empty-marker':