Merged from trunk:

  r27323 | jim | 2004-08-28 15:31:22 -0400 (Sat, 28 Aug 2004) | 15 lines

Integrated the latest doctest rom the Python cvs.

This brought two backward-incompatible changes:

- setUp and tearDown functions are now passed a test 
  argument, which is a doctest.DocTest.  This provides access to the
  test globals.

- The names of doctest reporting options for requesting diff output
  have changed.

Thesechanges are both positive for the long run, despite the
short-term backward-incompatability. Better before X3.0 final than
later.

browser/tests/test_registrations.py

@@ -59,7 +59,7 @@ def getQuery(self):
 sample = SampleObject()
 vocab = SampleVocabulary([])
 
-def setUp():
+def setUp(test):
     setup.placelessSetUp()
     context = xmlconfig.file("tests/registerWidgets.zcml",
                              zope.app.form.browser)