Log message for revision 69928: Merged r69926:69927 from 2.9 branch. Increased frame depth to account for decorator.
Changed: U Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py -=- Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py =================================================================== --- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 2006-09-02 13:02:35 UTC (rev 69927) +++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 2006-09-02 13:11:25 UTC (rev 69928) @@ -311,27 +311,27 @@ @extractLayer def ZopeDocTestSuite(module=None, **kw): - module = doctest._normalize_module(module) + module = doctest._normalize_module(module, depth=3) return ZopeSuiteFactory(module, **kw).doctestsuite() @extractLayer def ZopeDocFileSuite(*paths, **kw): if kw.get('module_relative', True): - kw['package'] = doctest._normalize_module(kw.get('package')) + kw['package'] = doctest._normalize_module(kw.get('package'), depth=3) return ZopeSuiteFactory(*paths, **kw).docfilesuite() @extractLayer def FunctionalDocTestSuite(module=None, **kw): - module = doctest._normalize_module(module) + module = doctest._normalize_module(module, depth=3) return FunctionalSuiteFactory(module, **kw).doctestsuite() @extractLayer def FunctionalDocFileSuite(*paths, **kw): if kw.get('module_relative', True): - kw['package'] = doctest._normalize_module(kw.get('package')) + kw['package'] = doctest._normalize_module(kw.get('package'), depth=3) return FunctionalSuiteFactory(*paths, **kw).docfilesuite() _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins