Prefer the standard libraries doctest module to the one from zope.testing.

11 files changed, 25 insertions, 46 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 0b95873..42b16ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,8 @@ CHANGES
 3.7.3 (unreleased)
 ------------------
 
+- Prefer the standard libraries doctest module to the one from zope.testing.
+
 - Fixed directlyProvides IVocabularyFactory for PermissionIdsVocabulary in
   Python code, even if it's unnecessary because IVocabularyFactory is provided
   in zcml.
diff --git a/src/zope/security/tests/test_adapter.py b/src/zope/security/tests/test_adapter.py
index 6b2373d..7f3c738 100644
--- a/src/zope/security/tests/test_adapter.py
+++ b/src/zope/security/tests/test_adapter.py
@@ -15,14 +15,10 @@
 $Id$
 """
 import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
 
 
 def test_suite():
     return unittest.TestSuite((
         DocTestSuite('zope.security.adapter'),
         ))
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
diff --git a/src/zope/security/tests/test_decorator.py b/src/zope/security/tests/test_decorator.py
index f62a4af..1a9012a 100644
--- a/src/zope/security/tests/test_decorator.py
+++ b/src/zope/security/tests/test_decorator.py
@@ -16,8 +16,7 @@
 $Id$
 """
 
-import unittest
-from zope.testing import doctest
+import doctest
 
 
 def test_suite():
diff --git a/src/zope/security/tests/test_directives.py b/src/zope/security/tests/test_directives.py
index bf9b0a2..9f973c7 100644
--- a/src/zope/security/tests/test_directives.py
+++ b/src/zope/security/tests/test_directives.py
@@ -19,10 +19,10 @@ import re
 import unittest
 import pprint
 from cStringIO import StringIO
+from doctest import DocTestSuite
 
 import zope.component
 from zope.interface import implements
-from zope.testing.doctest import DocTestSuite
 from zope.component.interface import queryInterface
 
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
diff --git a/src/zope/security/tests/test_location.py b/src/zope/security/tests/test_location.py
index 361844f..4200c69 100644
--- a/src/zope/security/tests/test_location.py
+++ b/src/zope/security/tests/test_location.py
@@ -16,8 +16,7 @@
 $Id: test_decorator.py 95518 2009-01-29 19:16:15Z ctheune $
 """
 
-import unittest
-from zope.testing import doctest
+import doctest
 
 
 def test_locationproxy_security():
diff --git a/src/zope/security/tests/test_module_directives.py b/src/zope/security/tests/test_module_directives.py
index fc4cbe9..173f16a 100644
--- a/src/zope/security/tests/test_module_directives.py
+++ b/src/zope/security/tests/test_module_directives.py
@@ -15,12 +15,13 @@
 
 $Id$
 """
+
+import doctest
 import unittest
 from pprint import PrettyPrinter
 
 import zope.security.zcml
 from zope.interface import Interface, Attribute
-from zope.testing import doctest
 from zope.component.testing import setUp, tearDown, PlacelessSetup
 from zope.configuration import xmlconfig
 
diff --git a/src/zope/security/tests/test_permission.py b/src/zope/security/tests/test_permission.py
index 1d97443..e2f3acc 100644
--- a/src/zope/security/tests/test_permission.py
+++ b/src/zope/security/tests/test_permission.py
@@ -16,7 +16,8 @@
 $Id$
 """
 import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
+
 from zope.component.testing import setUp, tearDown
 
 __docformat__ = "reStructuredText"
@@ -26,6 +27,3 @@ def test_suite():
         DocTestSuite('zope.security.permission',
                      setUp=setUp, tearDown=tearDown),
         ])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
diff --git a/src/zope/security/tests/test_proxy.py b/src/zope/security/tests/test_proxy.py
index b983ec7..78ad7e7 100644
--- a/src/zope/security/tests/test_proxy.py
+++ b/src/zope/security/tests/test_proxy.py
@@ -17,7 +17,8 @@ $Id$
 """
 
 import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
+
 from zope.security.proxy import getChecker, ProxyFactory, removeSecurityProxy
 from zope.proxy import ProxyBase as proxy
 
@@ -435,13 +436,8 @@ def test_using_mapping_slots_hack():
     """
 
 
-
 def test_suite():
     suite = unittest.makeSuite(ProxyTests)
     suite.addTest(DocTestSuite())
     suite.addTest(DocTestSuite('zope.security.proxy'))
     return suite
-
-if __name__=='__main__':
-    from unittest import main
-    main(defaultTest='test_suite')
diff --git a/src/zope/security/tests/test_set_checkers.py b/src/zope/security/tests/test_set_checkers.py
index 74ef5f8..6e04365 100644
--- a/src/zope/security/tests/test_set_checkers.py
+++ b/src/zope/security/tests/test_set_checkers.py
@@ -20,7 +20,8 @@ $Id$
 """
 import sys
 import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
+
 from zope.security.checker import ProxyFactory
 from zope.security.interfaces import ForbiddenAttribute
 
@@ -217,7 +218,3 @@ def test_suite():
         doctests.append(DocTestSuite(setUp=setUpSet))
         doctests.append(DocTestSuite(setUp=setUpImmutableSet))
     return unittest.TestSuite(doctests)
-
-if __name__ == '__main__':
-    import unittest
-    unittest.main()
diff --git a/src/zope/security/tests/test_standard_checkers.py b/src/zope/security/tests/test_standard_checkers.py
index 7cdf2db..33df431 100644
--- a/src/zope/security/tests/test_standard_checkers.py
+++ b/src/zope/security/tests/test_standard_checkers.py
@@ -542,18 +542,9 @@ if sys.version_info >= (2, 6):
         1
         >>> int(PBar.__class__ == abc.ABCMeta)
         1
-
-
-
         """
 
 
-
-from zope.testing.doctest import DocTestSuite
-
 def test_suite():
+    from doctest import DocTestSuite
     return DocTestSuite()
-
-if __name__ == '__main__':
-    import unittest
-    unittest.main()
diff --git a/src/zope/security/untrustedpython/tests.py b/src/zope/security/untrustedpython/tests.py
index ca6ff7a..9cfbff0 100644
--- a/src/zope/security/untrustedpython/tests.py
+++ b/src/zope/security/untrustedpython/tests.py
@@ -15,22 +15,22 @@
 
 $Id$
 """
+
+import doctest
 import unittest
 import re
-from zope.testing import doctest, renormalizing
+
+from zope.testing import renormalizing
+
 
 def test_suite():
     checker = renormalizing.RENormalizing([
-       (re.compile(r"'ImmutableModule' object"),
- 	           r'object'),
+       (re.compile(r"'ImmutableModule' object"), r'object'),
        ])
     return unittest.TestSuite((
         doctest.DocFileSuite('builtins.txt',
-                                 'rcompile.txt',
-                                 'interpreter.txt',checker=checker
-                                 ),
+                             'rcompile.txt',
+                             'interpreter.txt',
+                             checker=checker,
+                             ),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-