[Checkins] SVN: zope.dublincore/trunk/src/zope/dublincore/tests/test_ using doctest instead of deprecated zope.testing.unitdoctest

[Michael Howitz]

Log message for revision 109018:
  using doctest instead of deprecated zope.testing.unitdoctest
  

Changed:
  U   zope.dublincore/trunk/src/zope/dublincore/tests/test_dcsv.py
  U   zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py

-=-
Modified: zope.dublincore/trunk/src/zope/dublincore/tests/test_dcsv.py
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/tests/test_dcsv.py	2010-02-13 19:42:06 UTC (rev 109017)
+++ zope.dublincore/trunk/src/zope/dublincore/tests/test_dcsv.py	2010-02-13 19:43:05 UTC (rev 109018)
@@ -17,7 +17,7 @@
 """
 import unittest
 
-from zope.testing.doctestunit import DocTestSuite
+from doctest import DocTestSuite
 from zope.dublincore.dcsv import encode, decode
 
 

Modified: zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py	2010-02-13 19:42:06 UTC (rev 109017)
+++ zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py	2010-02-13 19:43:05 UTC (rev 109018)
@@ -19,12 +19,8 @@
 
 import doctest
 import unittest
-
 from zope import component
-
-from zope.testing.doctestunit import DocFileSuite
 from zope.testing import cleanup
-
 from zope.annotation.attribute import AttributeAnnotations
 from zope.dublincore import testing
 
@@ -34,15 +30,18 @@
     component.provideAdapter(AttributeAnnotations)
     testing.setUpDublinCore()
 
+
 def tearDown(test):
     cleanup.tearDown()
 
+
 def test_suite():
     return unittest.TestSuite(
         (
-        DocFileSuite('../property.txt',
-                     setUp=setUp,
-                     tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
+        doctest.DocFileSuite(
+            '../property.txt',
+             setUp=setUp,
+             tearDown=tearDown,
+           optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+           ),
         ))