Log message for revision 38599: Repaired 'handle_errors' usage for doctests, along with the supporting 'debug' argument passed to 'ZPublisher.Test.publish_module'.
Changed: U Zope/branches/Zope-2_8-branch/doc/CHANGES.txt U Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py U Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/Test.py -=- Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt =================================================================== --- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-09-24 17:27:37 UTC (rev 38598) +++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-09-24 17:35:59 UTC (rev 38599) @@ -31,6 +31,10 @@ Bugs Fixed + - Repaired 'handle_errors' usage for doctests, along with the + supporting 'debug' argument passed to + 'ZPublisher.Test.publish_module'. + - Collector #1879: applied patch by Dieter Maurer to fix a bug in ac_aquire() ignoring the default argument Modified: Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 2005-09-24 17:27:37 UTC (rev 38598) +++ Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 2005-09-24 17:35:59 UTC (rev 38599) @@ -12,7 +12,7 @@ ############################################################################## """Support for (functional) doc tests -$Id: functional.py,v 1.2 2005/03/26 18:07:08 shh42 Exp $ +$Id$ """ import sys, re, base64 @@ -176,7 +176,9 @@ publish_module('Zope2', stdin=instream, response=response, - environ=env) + environ=env, + debug=not handle_errors, + ) header_output.setResponseStatus(response.getStatus(), response.errmsg) header_output.setResponseHeaders(response.headers) Modified: Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/Test.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/Test.py 2005-09-24 17:27:37 UTC (rev 38598) +++ Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/Test.py 2005-09-24 17:35:59 UTC (rev 38599) @@ -199,6 +199,8 @@ else: must_die=sys.exc_info() response.exception(1, v) except: + if debug: + raise response.exception() status=response.getStatus() if response: _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins