[Checkins] SVN: zope.app.apidoc/trunk/ Prefer the standard libraries doctest module to the one from zope.testing.

Gediminas Paulauskas menesis at pov.lt
Mon Aug 2 15:21:24 EDT 2010


Log message for revision 115384:
  Prefer the standard libraries doctest module to the one from zope.testing.
  

Changed:
  U   zope.app.apidoc/trunk/CHANGES.txt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/browser/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py

-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/CHANGES.txt	2010-08-02 19:21:24 UTC (rev 115384)
@@ -5,6 +5,8 @@
 3.7.4 (unreleased)
 ------------------
 
+- Prefer the standard libraries doctest module to the one from zope.testing.
+
 - Remove unneeded dependencies zope.app.component and zope.app.container
 
 3.7.3 (2010-07-14)

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -16,11 +16,11 @@
 $Id$
 """
 import unittest
-from zope.testing.doctest import DocTestSuite
+import doctest
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('zope.app.apidoc.bookmodule.browser'),
+        doctest.DocTestSuite('zope.app.apidoc.bookmodule.browser'),
         ))
 
 if __name__ == '__main__':

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -17,9 +17,9 @@
 """
 import re
 import unittest
+import doctest
 
 import zope.app.testing.functional
-from zope.testing import doctest
 from zope.testing import renormalizing
 from zope.app.testing.functional import BrowserTestCase, FunctionalNoDevMode
 from zope.app.testing.functional import FunctionalDocFileSuite

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -17,11 +17,13 @@
 """
 import os
 import unittest
+import doctest
 import re
+
 from zope.component.interfaces import IFactory
 from zope.configuration import xmlconfig
 from zope.interface import implements
-from zope.testing import doctest, renormalizing
+from zope.testing import renormalizing
 from zope.traversing.interfaces import IContainmentRoot
 
 import zope.app

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -17,9 +17,9 @@
 """
 import os
 import unittest
+import doctest
+
 from zope.configuration import xmlconfig
-from zope.testing import doctest
-
 import zope.app.appsetup.appsetup
 from zope.app.testing import placelesssetup
 

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -16,10 +16,10 @@
 $Id$
 """
 import unittest
+import doctest
 
 from zope.component.interfaces import IFactory
 from zope.interface.interfaces import IInterface
-from zope.testing import doctest
 
 from zope.app.apidoc.testing import APIDocLayer
 from zope.app.apidoc.apidoc import APIDocumentation

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -17,11 +17,11 @@
 """
 from pprint import PrettyPrinter
 import unittest
+import doctest
 
 import zope.component.testing
 from zope.component.interfaces import IFactory
 from zope.interface import implements
-from zope.testing import doctest
 from zope.traversing.interfaces import IContainmentRoot
 from zope.location import LocationProxy
 

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -16,7 +16,8 @@
 $Id$
 """
 import unittest
-from zope.testing.doctest import DocTestSuite
+import doctest
+
 from zope.app.testing.functional import BrowserTestCase
 from zope.app.testing import placelesssetup
 from zope.app.apidoc.testing import APIDocLayer
@@ -39,9 +40,9 @@
 def test_suite():
     TypeModuleTests.layer = APIDocLayer
     return unittest.TestSuite((
-        DocTestSuite('zope.app.apidoc.typemodule.type',
-                     setUp=placelesssetup.setUp,
-                     tearDown=placelesssetup.tearDown),
+        doctest.DocTestSuite('zope.app.apidoc.typemodule.type',
+                             setUp=placelesssetup.setUp,
+                             tearDown=placelesssetup.tearDown),
         unittest.makeSuite(TypeModuleTests),
         ))
 

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -16,8 +16,9 @@
 $Id$
 """
 import unittest
+import doctest
+
 import zope.deprecation
-from zope.testing import doctest
 from zope.traversing.interfaces import IPhysicallyLocatable
 from zope.location.traversing import LocationPhysicallyLocatable
 

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py	2010-08-02 19:13:04 UTC (rev 115383)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py	2010-08-02 19:21:24 UTC (rev 115384)
@@ -17,8 +17,9 @@
 """
 import os
 import unittest
+import doctest
+
 from zope.configuration import xmlconfig
-from zope.testing import doctest
 from zope.traversing.interfaces import IPhysicallyLocatable
 from zope.location.traversing import LocationPhysicallyLocatable
 



More information about the checkins mailing list