[Checkins] SVN: zope.contentprovider/trunk/ Prefer the standard libraries doctest module to the one from zope.testing.

[Hanno Schlichting]

Log message for revision 111718:
  Prefer the standard libraries doctest module to the one from zope.testing.
  

Changed:
  U   zope.contentprovider/trunk/CHANGES.txt
  U   zope.contentprovider/trunk/setup.py
  U   zope.contentprovider/trunk/src/zope/contentprovider/tests.py

-=-
Modified: zope.contentprovider/trunk/CHANGES.txt
===================================================================
--- zope.contentprovider/trunk/CHANGES.txt	2010-04-30 20:46:02 UTC (rev 111717)
+++ zope.contentprovider/trunk/CHANGES.txt	2010-04-30 20:48:15 UTC (rev 111718)
@@ -2,12 +2,11 @@
 CHANGES
 =======
 
-3.8 (unreleased)
-----------------
+3.7.1 (unreleased)
+------------------
 
-- Nothing changed yet.
+- Prefer the standard libraries doctest module to the one from zope.testing.
 
-
 3.7 (2010-04-27)
 ----------------
 

Modified: zope.contentprovider/trunk/setup.py
===================================================================
--- zope.contentprovider/trunk/setup.py	2010-04-30 20:46:02 UTC (rev 111717)
+++ zope.contentprovider/trunk/setup.py	2010-04-30 20:48:15 UTC (rev 111718)
@@ -27,7 +27,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.contentprovider',
-      version = '3.8dev',
+      version = '3.7.1dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='Content Provider Framework for Zope Templates',

Modified: zope.contentprovider/trunk/src/zope/contentprovider/tests.py
===================================================================
--- zope.contentprovider/trunk/src/zope/contentprovider/tests.py	2010-04-30 20:46:02 UTC (rev 111717)
+++ zope.contentprovider/trunk/src/zope/contentprovider/tests.py	2010-04-30 20:48:15 UTC (rev 111718)
@@ -16,11 +16,13 @@
 $Id$
 """
 __docformat__ = 'restructuredtext'
+
+import doctest
 import os.path
 import unittest
+
 from zope.component import eventtesting
-from zope.testing import doctest, cleanup
-from zope.testing.doctest import DocFileSuite
+from zope.testing import cleanup
 
 counter = 0
 mtime_func = None
@@ -51,11 +53,8 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocFileSuite('README.txt',
-                     setUp=setUp, tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
+        doctest.DocFileSuite('README.txt',
+            setUp=setUp, tearDown=tearDown,
+            optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+            ),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')