[Checkins] SVN: Products.GenericSetup/trunk/ Use the standard libraries doctest module.

[Hanno Schlichting]

Log message for revision 113188:
  Use the standard libraries doctest module.
  

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/tests.py
  U   Products.GenericSetup/trunk/docs/CHANGES.rst

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py	2010-06-06 13:30:12 UTC (rev 113187)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py	2010-06-06 13:31:20 UTC (rev 113188)
@@ -15,9 +15,9 @@
 $Id$
 """
 
+import doctest
 import unittest
-from zope.testing import doctest
-from zope.testing.doctest import ELLIPSIS
+from doctest import ELLIPSIS
 from zope.testing.cleanup import cleanUp
 
 from Products.GenericSetup.registry import _import_step_registry
@@ -441,6 +441,3 @@
     suite.addTest(unittest.makeSuite(ImportStepTests))
     suite.addTest(unittest.makeSuite(ExportStepTests))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/tests.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/tests.py	2010-06-06 13:30:12 UTC (rev 113187)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/tests.py	2010-06-06 13:31:20 UTC (rev 113188)
@@ -15,13 +15,10 @@
 $Id$
 """
 
+import doctest
 import unittest
-from zope.testing import doctest
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(doctest.DocFileSuite('upgrade.txt'))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

Modified: Products.GenericSetup/trunk/docs/CHANGES.rst
===================================================================
--- Products.GenericSetup/trunk/docs/CHANGES.rst	2010-06-06 13:30:12 UTC (rev 113187)
+++ Products.GenericSetup/trunk/docs/CHANGES.rst	2010-06-06 13:31:20 UTC (rev 113188)
@@ -4,6 +4,8 @@
 1.6.1 (unreleased)
 ------------------
 
+- Use the standard libraries doctest module.
+
 - Deal with deprecation warnings for Zope 2.13.
 
 - Fixed bug which broke the took upgrade tab after running an upgrade step