[Checkins] SVN: zope.copypastemove/trunk/ Removed use of 'zope.testing.doctestunit' in favor of stdlib's 'doctest.

[Tres Seaver]

Log message for revision 110999:
  Removed use of 'zope.testing.doctestunit' in favor of stdlib's 'doctest.
  

Changed:
  U   zope.copypastemove/trunk/CHANGES.txt
  U   zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectcopier.py
  U   zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectmover.py
  U   zope.copypastemove/trunk/src/zope/copypastemove/tests/test_rename.py

-=-
Modified: zope.copypastemove/trunk/CHANGES.txt
===================================================================
--- zope.copypastemove/trunk/CHANGES.txt	2010-04-16 19:28:30 UTC (rev 110998)
+++ zope.copypastemove/trunk/CHANGES.txt	2010-04-16 19:37:12 UTC (rev 110999)
@@ -5,6 +5,8 @@
 3.6.1 (unreleased)
 ------------------
 
+- Removed use of 'zope.testing.doctestunit' in favor of stdlib's 'doctest.
+
 - Moved zope.copypastemove related tests from zope.container here.
 
 3.6.0 (2009-12-16)

Modified: zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectcopier.py
===================================================================
--- zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectcopier.py	2010-04-16 19:28:30 UTC (rev 110998)
+++ zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectcopier.py	2010-04-16 19:37:12 UTC (rev 110999)
@@ -15,12 +15,13 @@
 
 $Id$
 """
-from unittest import TestCase, TestSuite, main, makeSuite
+import unittest
+import doctest
 
 import zope.component
-from zope.testing import doctest
 from zope.traversing.api import traverse
-from zope.component.eventtesting import getEvents, clearEvents
+from zope.component.eventtesting import clearEvents
+from zope.component.eventtesting import getEvents
 from zope.copypastemove import ObjectCopier
 from zope.copypastemove.interfaces import IObjectCopier
 
@@ -77,7 +78,7 @@
     """
 
 
-class ObjectCopierTest(testing.ContainerPlacefulSetup, TestCase):
+class ObjectCopierTest(testing.ContainerPlacefulSetup, unittest.TestCase):
 
     def setUp(self):
         testing.ContainerPlacefulSetup.setUp(self)
@@ -201,11 +202,9 @@
         self.failUnless('folder1' in target)
 
 def test_suite():
-    return TestSuite((
-        makeSuite(ObjectCopierTest),
-        doctest.DocTestSuite(setUp=testing.ContainerPlacefulSetup().setUp,
-                             tearDown=testing.ContainerPlacefulSetup().tearDown),
+    return unittest.TestSuite((
+        unittest.makeSuite(ObjectCopierTest),
+        doctest.DocTestSuite(
+                    setUp=testing.ContainerPlacefulSetup().setUp,
+                    tearDown=testing.ContainerPlacefulSetup().tearDown),
         ))
-
-if __name__=='__main__':
-    main(defaultTest='test_suite')

Modified: zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectmover.py
===================================================================
--- zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectmover.py	2010-04-16 19:28:30 UTC (rev 110998)
+++ zope.copypastemove/trunk/src/zope/copypastemove/tests/test_objectmover.py	2010-04-16 19:37:12 UTC (rev 110999)
@@ -15,12 +15,13 @@
 
 $Id$
 """
-from unittest import TestCase, TestSuite, main, makeSuite
+import unittest
+import doctest
 
 import zope.component
-from zope.testing import doctest
 from zope.traversing.api import traverse
-from zope.component.eventtesting import getEvents, clearEvents
+from zope.component.eventtesting import clearEvents
+from zope.component.eventtesting import getEvents
 from zope.copypastemove import ObjectMover
 from zope.copypastemove.interfaces import IObjectMover
 
@@ -91,7 +92,7 @@
     """
 
 
-class ObjectMoverTest(testing.ContainerPlacefulSetup, TestCase):
+class ObjectMoverTest(testing.ContainerPlacefulSetup, unittest.TestCase):
 
     def setUp(self):
         testing.ContainerPlacefulSetup.setUp(self)
@@ -218,11 +219,9 @@
 
         
 def test_suite():
-    return TestSuite((
-        makeSuite(ObjectMoverTest),
-        doctest.DocTestSuite(setUp=testing.ContainerPlacefulSetup().setUp,
-                             tearDown=testing.ContainerPlacefulSetup().tearDown),
+    return unittest.TestSuite((
+        unittest.makeSuite(ObjectMoverTest),
+        doctest.DocTestSuite(
+                    setUp=testing.ContainerPlacefulSetup().setUp,
+                    tearDown=testing.ContainerPlacefulSetup().tearDown),
         ))
-
-if __name__=='__main__':
-    main(defaultTest='test_suite')

Modified: zope.copypastemove/trunk/src/zope/copypastemove/tests/test_rename.py
===================================================================
--- zope.copypastemove/trunk/src/zope/copypastemove/tests/test_rename.py	2010-04-16 19:28:30 UTC (rev 110998)
+++ zope.copypastemove/trunk/src/zope/copypastemove/tests/test_rename.py	2010-04-16 19:37:12 UTC (rev 110999)
@@ -17,7 +17,7 @@
 """
 import unittest
 
-from zope.testing.doctestunit import DocTestSuite
+from doctest import DocTestSuite
 from zope.component import testing, eventtesting
 from zope.container.testing import PlacelessSetup