[Checkins] SVN: zope.security/trunk/ Fixed usage of doctest module, tests can be run multiple times now.

[Christian Theune]

Log message for revision 78753:
  Fixed usage of doctest module, tests can be run multiple times now.
  

Changed:
  U   zope.security/trunk/CHANGES.txt
  U   zope.security/trunk/src/zope/security/tests/test_decorator.py
  U   zope.security/trunk/src/zope/security/tests/test_proxy.py

-=-
Modified: zope.security/trunk/CHANGES.txt
===================================================================
--- zope.security/trunk/CHANGES.txt	2007-08-12 09:38:30 UTC (rev 78752)
+++ zope.security/trunk/CHANGES.txt	2007-08-12 09:38:54 UTC (rev 78753)
@@ -1,9 +1,14 @@
 zope.security package changelog
 ===============================
-Next release 
+
+Next release
 ------------
+
 - zope.security now works on Python 2.5
 
+- Fixed inclusion of doctest to use the doctest module from zope.testing. Now
+  tests can be run multiple times without breaking. (#98250)
+
 3.4.0b2 - 2007/06/15
 --------------------
 

Modified: zope.security/trunk/src/zope/security/tests/test_decorator.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_decorator.py	2007-08-12 09:38:30 UTC (rev 78752)
+++ zope.security/trunk/src/zope/security/tests/test_decorator.py	2007-08-12 09:38:54 UTC (rev 78753)
@@ -13,10 +13,10 @@
 ##############################################################################
 """Context Tests
 
-$Id: tests.py 66343 2006-04-03 04:59:49Z philikon $
+$Id$
 """
 import unittest
-import doctest
+from zope.testing import doctest
 
 def test_suite():
     suite = doctest.DocTestSuite()

Modified: zope.security/trunk/src/zope/security/tests/test_proxy.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_proxy.py	2007-08-12 09:38:30 UTC (rev 78752)
+++ zope.security/trunk/src/zope/security/tests/test_proxy.py	2007-08-12 09:38:54 UTC (rev 78753)
@@ -17,6 +17,7 @@
 """
 
 import unittest
+from zope.testing.doctest import DocTestSuite
 from zope.security.proxy import getChecker, ProxyFactory, removeSecurityProxy
 from zope.proxy import ProxyBase as proxy
 
@@ -437,7 +438,6 @@
 
 def test_suite():
     suite = unittest.makeSuite(ProxyTests)
-    from doctest import DocTestSuite
     suite.addTest(DocTestSuite())
     suite.addTest(DocTestSuite('zope.security.proxy'))
     return suite