[Checkins] SVN: zope.securitypolicy/trunk/ Use doctest module instead of the deprecated zope.testing.doctest

[Vincent Fretin]

Log message for revision 108200:
  Use doctest module instead of the deprecated zope.testing.doctest

Changed:
  U   zope.securitypolicy/trunk/CHANGES.txt
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py

-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt	2010-01-17 18:13:49 UTC (rev 108199)
+++ zope.securitypolicy/trunk/CHANGES.txt	2010-01-17 18:52:10 UTC (rev 108200)
@@ -5,6 +5,8 @@
 3.6.2 (unreleased)
 ------------------
 
+- Use doctest module instead of the deprecated zope.testing.doctest.
+
 - AnnotationGrantInfo implements IGrantInfo.
 
 3.6.1 (2009-07-24)

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py	2010-01-17 18:13:49 UTC (rev 108199)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_role.py	2010-01-17 18:52:10 UTC (rev 108200)
@@ -15,8 +15,8 @@
 
 $Id$
 """
+from doctest import DocTestSuite
 import unittest
-from zope.testing.doctest import DocTestSuite
 
 
 def test_suite():

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py	2010-01-17 18:13:49 UTC (rev 108199)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_vocabulary.py	2010-01-17 18:52:10 UTC (rev 108200)
@@ -15,8 +15,8 @@
 
 $Id$
 """
+from doctest import DocTestSuite
 import unittest
-from zope.testing.doctest import DocTestSuite
 
 def test_suite():
     return unittest.TestSuite((

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py	2010-01-17 18:13:49 UTC (rev 108199)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py	2010-01-17 18:52:10 UTC (rev 108200)
@@ -16,11 +16,11 @@
 $Id$
 """
 
+from doctest import DocFileSuite
 import unittest
 from zope.component import provideAdapter
 from zope.component.testing import setUp as componentSetUp
 from zope.component.testing import tearDown as componentTearDown
-from zope.testing.doctest import DocFileSuite
 from zope.annotation.interfaces import IAnnotatable
 from zope.annotation.attribute import AttributeAnnotations
 from zope.security.management import endInteraction