[Checkins] SVN: zope.app.zapi/trunk/ - Using Python's ``doctest`` module instead of depreacted

[Michael Howitz]

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

Changed:
  U   zope.app.zapi/trunk/CHANGES.txt
  U   zope.app.zapi/trunk/src/zope/app/zapi/tests.py

-=-
Modified: zope.app.zapi/trunk/CHANGES.txt
===================================================================
--- zope.app.zapi/trunk/CHANGES.txt	2011-03-01 11:01:38 UTC (rev 120640)
+++ zope.app.zapi/trunk/CHANGES.txt	2011-03-01 11:55:21 UTC (rev 120641)
@@ -4,7 +4,8 @@
 3.4.2 (unreleased)
 ------------------
 
-- ...
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
 
 3.4.1 (2009-07-23)
 ------------------

Modified: zope.app.zapi/trunk/src/zope/app/zapi/tests.py
===================================================================
--- zope.app.zapi/trunk/src/zope/app/zapi/tests.py	2011-03-01 11:01:38 UTC (rev 120640)
+++ zope.app.zapi/trunk/src/zope/app/zapi/tests.py	2011-03-01 11:55:21 UTC (rev 120641)
@@ -11,10 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""ZTAPI Tests
-
-$Id$
-"""
+"""ZTAPI Tests"""
+import doctest
 import unittest
 from zope.app.testing import placelesssetup
 from zope.app import zapi
@@ -28,7 +26,7 @@
         """
         Ensure that the zapi module provides the IZAPI interface
         """
-        
+
         from zope.app import zapi
         # deprecation proxies don't seem to always work with
         # verifyObject, so remove any proxies
@@ -41,19 +39,14 @@
         zope.deprecation.__show__.off()
         verifyObject(IZAPI, zapi)
         zope.deprecation.__show__.on()
-        
 
+
 def setUp(test):
     placelesssetup.setUp()
 
 def test_suite():
-    from zope.testing import doctest
     return unittest.TestSuite((
         unittest.makeSuite(TestIZAPI),
         doctest.DocFileSuite('README.txt',
                              setUp=setUp, tearDown=placelesssetup.tearDown),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-