[Checkins] SVN: z3c.responseheaders/trunk/ - Using Python's ``doctest`` module instead of depreacted

[Michael Howitz]

Log message for revision 117224:
  - Using Python's ``doctest`` module instead of depreacted
    ``zope.testing.doctest``.
  
  

Changed:
  U   z3c.responseheaders/trunk/CHANGES.txt
  U   z3c.responseheaders/trunk/src/z3c/responseheaders/tests.py

-=-
Modified: z3c.responseheaders/trunk/CHANGES.txt
===================================================================
--- z3c.responseheaders/trunk/CHANGES.txt	2010-10-05 06:11:41 UTC (rev 117223)
+++ z3c.responseheaders/trunk/CHANGES.txt	2010-10-05 06:16:15 UTC (rev 117224)
@@ -2,9 +2,16 @@
 Changes
 =======
 
-2007/07/14 0.1.0
-================
+0.1.1 (unreleased)
+==================
 
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
+
+
+0.1.0 (2007/07/14)
+==================
+
 - First egg release
 
 

Modified: z3c.responseheaders/trunk/src/z3c/responseheaders/tests.py
===================================================================
--- z3c.responseheaders/trunk/src/z3c/responseheaders/tests.py	2010-10-05 06:11:41 UTC (rev 117223)
+++ z3c.responseheaders/trunk/src/z3c/responseheaders/tests.py	2010-10-05 06:16:15 UTC (rev 117224)
@@ -11,40 +11,27 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
-$Id$
-"""
-__docformat__ = 'restructuredtext'
 
-import unittest
-
-from zope import component
-
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-from zope.publisher.interfaces.browser import IBrowserView
-
-from zope.app.testing import setup
 from zope.app.publication.interfaces import IBeforeTraverseEvent
-
+from zope.publisher.interfaces.browser import IBrowserView
+import doctest
 import setter
+import zope.app.testing.setup
+import zope.component
 
+
 def setUp(test):
-    root = setup.placefulSetUp()
-    component.provideHandler(setter.onBrowserViewBeforeTraverse,
-                             (IBrowserView, IBeforeTraverseEvent))
+    zope.app.testing.setup.placefulSetUp()
+    zope.component.provideHandler(setter.onBrowserViewBeforeTraverse,
+                                  (IBrowserView, IBeforeTraverseEvent))
 
 def tearDown(test):
-    setup.placefulTearDown()
+    zope.app.testing.setup.placefulTearDown()
 
-def test_suite():
-    return unittest.TestSuite((
-        DocFileSuite('README.txt',
-                     setUp=setUp, tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
-        ))
 
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
+def test_suite():
+    return doctest.DocFileSuite(
+        'README.txt',
+        setUp=setUp, tearDown=tearDown,
+        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+        )