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

[Michael Howitz]

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

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

-=-
Modified: z3c.viewtemplate/trunk/CHANGES.txt
===================================================================
--- z3c.viewtemplate/trunk/CHANGES.txt	2010-11-03 02:29:42 UTC (rev 118135)
+++ z3c.viewtemplate/trunk/CHANGES.txt	2010-11-03 07:35:19 UTC (rev 118136)
@@ -2,8 +2,15 @@
 CHANGES
 =======
 
+0.4.1 (unreleased)
+------------------
+
  - fixed exception handling if macro is not found in the template
 
+ - Using Python's ``doctest`` module instead of depreacted
+   ``zope.testing.doctest``.
+
+
 0.4.0 (2008-11-05)
 ------------------
 

Modified: z3c.viewtemplate/trunk/src/z3c/viewtemplate/tests.py
===================================================================
--- z3c.viewtemplate/trunk/src/z3c/viewtemplate/tests.py	2010-11-03 02:29:42 UTC (rev 118135)
+++ z3c.viewtemplate/trunk/src/z3c/viewtemplate/tests.py	2010-11-03 07:35:19 UTC (rev 118136)
@@ -11,18 +11,11 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
-$Id$
-"""
-__docformat__ = 'restructuredtext'
-
+from zope.app.testing import setup
+import doctest
 import unittest
 
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-from zope.app.testing import setup
 
-
 def setUp(test):
     root = setup.placefulSetUp(site=True)
     test.globs['root'] = root
@@ -33,13 +26,7 @@
 
 
 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')
+    return doctest.DocFileSuite(
+        'README.txt',
+        setUp=setUp, tearDown=tearDown,
+        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)