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_addMenuItem.py

@@ -16,7 +16,7 @@
 >>> context = Context()
 >>> addMenuItem(context, class_=X, title="Add an X",
 ...             permission="zope.ManageContent")
->>> context # doctest: +CONTEXT_DIFF
+>>> context
 ((('utility',
    <InterfaceClass zope.component.interfaces.IFactory>,
    'zope.app.browser.add.zope.app.publisher.browser.tests.test_addMenuItem.X'),
@@ -131,7 +131,7 @@ def test_w_factory_class_view():
     >>> addMenuItem(context, class_=X, title="Add an X",
     ...             permission="zope.ManageContent", description="blah blah",
     ...             filter="context/foo", view="AddX")
-    >>> context # doctest: +CONTEXT_DIFF
+    >>> context
     ((('utility',
        <InterfaceClass zope.component.interfaces.IFactory>,
        'zope.app.browser.add.""" \

xmlrpc/ftests.py

@@ -39,11 +39,11 @@ def __getattr__(self, name):
 name = 'zope.app.publisher.xmlrpc.README'
 
 
-def setUp():
+def setUp(test):
     globs['__name__'] = name    
     sys.modules[name] = FakeModule(globs)
 
-def tearDown():
+def tearDown(test):
     # clean up the views we registered:
 
     # we use the fact that registering None unregisters whatever is