[Checkins] SVN: zope.app.server/trunk/src/zope/app/server/tests/test_server Use Python's doctest module instead of deprecated zope.testing.doctest.

[Gediminas Paulauskas]

Log message for revision 121039:
  Use Python's doctest module instead of deprecated zope.testing.doctest.
  

Changed:
  U   zope.app.server/trunk/src/zope/app/server/tests/test_server.py
  U   zope.app.server/trunk/src/zope/app/server/tests/test_servertype.py

-=-
Modified: zope.app.server/trunk/src/zope/app/server/tests/test_server.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/tests/test_server.py	2011-03-18 16:02:31 UTC (rev 121038)
+++ zope.app.server/trunk/src/zope/app/server/tests/test_server.py	2011-03-18 16:06:19 UTC (rev 121039)
@@ -12,14 +12,13 @@
 #
 ##############################################################################
 """Tests for zope.app.server.server
-
-$Id$
 """
 import unittest
+import doctest
 
 from zope.interface.verify import verifyObject
-from zope.testing import doctest
-from zope.app.testing import ztapi, setup, placelesssetup
+from zope.component import provideUtility
+from zope.app.testing import setup
 
 
 def doctest_ServerFactory():
@@ -41,8 +40,8 @@
         ...         return ('%s server on %s:%d, registered with %s,\n'
         ...                 'serving from %s, verbosity %s'
         ...                 % (name, ip, port, task_dispatcher, db, verbose))
-        >>> ztapi.provideUtility(IServerType, MyServerType(), name='HTTP')
-        >>> ztapi.provideUtility(IServerType, MyServerType(), name='FTP')
+        >>> provideUtility(MyServerType(), IServerType, name='HTTP')
+        >>> provideUtility(MyServerType(), IServerType, name='FTP')
 
     ServerFactory is used to hook into ZConfig and create instances of servers
     specified in zope.conf.  It gets a `section` argument that contains

Modified: zope.app.server/trunk/src/zope/app/server/tests/test_servertype.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/tests/test_servertype.py	2011-03-18 16:02:31 UTC (rev 121038)
+++ zope.app.server/trunk/src/zope/app/server/tests/test_servertype.py	2011-03-18 16:06:19 UTC (rev 121039)
@@ -12,13 +12,11 @@
 #
 ##############################################################################
 """Tests for zope.app.server.servertype
-
-$Id$
 """
 import unittest
+import doctest
 
 from zope.interface.verify import verifyObject
-from zope.testing import doctest
 
 
 def doctest_ServerType():