[Checkins] SVN: zope.security/trunk/ Prefer the standard libraries doctest module to the one from zope.testing.
Hanno Schlichting
hannosch at hannosch.eu
Fri Apr 30 17:52:53 EDT 2010
Log message for revision 111761:
Prefer the standard libraries doctest module to the one from zope.testing.
Changed:
U zope.security/trunk/CHANGES.txt
U zope.security/trunk/src/zope/security/tests/test_adapter.py
U zope.security/trunk/src/zope/security/tests/test_decorator.py
U zope.security/trunk/src/zope/security/tests/test_directives.py
U zope.security/trunk/src/zope/security/tests/test_location.py
U zope.security/trunk/src/zope/security/tests/test_module_directives.py
U zope.security/trunk/src/zope/security/tests/test_permission.py
U zope.security/trunk/src/zope/security/tests/test_proxy.py
U zope.security/trunk/src/zope/security/tests/test_set_checkers.py
U zope.security/trunk/src/zope/security/tests/test_standard_checkers.py
U zope.security/trunk/src/zope/security/untrustedpython/tests.py
-=-
Modified: zope.security/trunk/CHANGES.txt
===================================================================
--- zope.security/trunk/CHANGES.txt 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/CHANGES.txt 2010-04-30 21:52:52 UTC (rev 111761)
@@ -5,6 +5,8 @@
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.
Modified: zope.security/trunk/src/zope/security/tests/test_adapter.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_adapter.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_adapter.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -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')
Modified: zope.security/trunk/src/zope/security/tests/test_decorator.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_decorator.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_decorator.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -16,8 +16,7 @@
$Id$
"""
-import unittest
-from zope.testing import doctest
+import doctest
def test_suite():
Modified: zope.security/trunk/src/zope/security/tests/test_directives.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_directives.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_directives.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -19,10 +19,10 @@
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
Modified: zope.security/trunk/src/zope/security/tests/test_location.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_location.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_location.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -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():
Modified: zope.security/trunk/src/zope/security/tests/test_module_directives.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_module_directives.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_module_directives.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -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
Modified: zope.security/trunk/src/zope/security/tests/test_permission.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_permission.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_permission.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -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 @@
DocTestSuite('zope.security.permission',
setUp=setUp, tearDown=tearDown),
])
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: zope.security/trunk/src/zope/security/tests/test_proxy.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_proxy.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_proxy.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -17,7 +17,8 @@
"""
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_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')
Modified: zope.security/trunk/src/zope/security/tests/test_set_checkers.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_set_checkers.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_set_checkers.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -20,7 +20,8 @@
"""
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 @@
doctests.append(DocTestSuite(setUp=setUpSet))
doctests.append(DocTestSuite(setUp=setUpImmutableSet))
return unittest.TestSuite(doctests)
-
-if __name__ == '__main__':
- import unittest
- unittest.main()
Modified: zope.security/trunk/src/zope/security/tests/test_standard_checkers.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_standard_checkers.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/tests/test_standard_checkers.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -542,18 +542,9 @@
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()
Modified: zope.security/trunk/src/zope/security/untrustedpython/tests.py
===================================================================
--- zope.security/trunk/src/zope/security/untrustedpython/tests.py 2010-04-30 21:52:18 UTC (rev 111760)
+++ zope.security/trunk/src/zope/security/untrustedpython/tests.py 2010-04-30 21:52:52 UTC (rev 111761)
@@ -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')
-
More information about the checkins
mailing list