[Checkins] SVN: zope.app.form/trunk/ Prefer zope.testing.doctest over doctestunit and adjust test output to newer zope.schema release.

[Hanno Schlichting]

Log message for revision 106869:
  Prefer zope.testing.doctest over doctestunit and adjust test output to newer zope.schema release.
  

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/tests/test_browserwidget.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_displaywidget.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_exception.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdocs.py
  U   zope.app.form/trunk/src/zope/app/form/browser/widget.py
  U   zope.app.form/trunk/src/zope/app/form/tests/test_widget.py

-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/CHANGES.txt	2009-12-22 14:18:18 UTC (rev 106869)
@@ -2,9 +2,11 @@
 CHANGES
 =======
 
-3.12.0 (unreleased)
+3.11.1 (unreleased)
 ===================
 
+- Prefer zope.testing.doctest over doctestunit and adjust test output to newer
+  zope.schema release.
 
 3.11.0 (2009-12-18)
 ===================

Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/setup.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -27,7 +27,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.form',
-      version = '3.12.0dev',
+      version = '3.11.1dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='The Original Zope 3 Form Framework',

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_browserwidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_browserwidget.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_browserwidget.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -20,7 +20,7 @@
 from zope.interface import Interface, implements
 from zope.publisher.browser import TestRequest
 from zope.schema import Text, Int
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 
 from zope.app.form.browser.widget import SimpleInputWidget
 from zope.app.form.browser.tests import support

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_displaywidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_displaywidget.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_displaywidget.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -13,14 +13,14 @@
 ##############################################################################
 """Generic Text Widgets tests
 
-$Id: test_widgetdocs.py 27082 2004-08-12 20:03:58Z srichter $
+$Id$
 """
 import unittest
 from zope.interface.verify import verifyClass
 from zope.interface.exceptions import DoesNotImplement
 from zope.publisher.browser import TestRequest
 from zope.schema import TextLine
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 
 from zope.app.form.browser.widget import DisplayWidget, UnicodeDisplayWidget
 

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_exception.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_exception.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_exception.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -16,7 +16,7 @@
 $Id$
 """
 import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 
 def test_suite():
     return unittest.TestSuite((

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -18,7 +18,7 @@
 import unittest
 
 from zope.schema.interfaces import ITextLine
-from zope.testing import doctest, doctestunit
+from zope.testing import doctest, doctest
 from zope.component import testing
 
 from zope.app.testing import ztapi
@@ -35,7 +35,6 @@
     return unittest.TestSuite((
         doctest.DocFileSuite('../form.txt',
                              setUp=setUp, tearDown=testing.tearDown,
-                             globs={'pprint': doctestunit.pprint},
                              optionflags=doctest.NORMALIZE_WHITESPACE),
         ))
 

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -21,7 +21,7 @@
 from zope.configuration import xmlconfig
 from zope.interface import implements
 from zope.publisher.browser import TestRequest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 
 from zope.component import testing
 # import all widgets (in this case, importing * is ok, since we

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdocs.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdocs.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdocs.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -16,7 +16,7 @@
 $Id$
 """
 import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 
 def test_suite():
     suite = unittest.TestSuite()

Modified: zope.app.form/trunk/src/zope/app/form/browser/widget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/widget.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/browser/widget.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -233,7 +233,7 @@
         >>> field.required = True
         >>> widget.getInputValue()
         Traceback (most recent call last):
-        WidgetInputError: ('foo', u'Foo', RequiredMissing())
+        WidgetInputError: ('foo', u'Foo', RequiredMissing('foo'))
 
     However, if the field is not required, the empty string will be converted
     by the widget into the field's `missing_value` and read as a legal field

Modified: zope.app.form/trunk/src/zope/app/form/tests/test_widget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/tests/test_widget.py	2009-12-22 14:08:56 UTC (rev 106868)
+++ zope.app.form/trunk/src/zope/app/form/tests/test_widget.py	2009-12-22 14:18:18 UTC (rev 106869)
@@ -19,7 +19,7 @@
 
 from zope.component.testing import setUp, tearDown
 from zope.publisher.browser import TestRequest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 
 from zope.app.form import Widget