[Checkins] SVN: zope.server/trunk/ Using python's ``doctest`` module instead of deprecated ``zope.testing.doctest``.

[Michael Howitz]

Log message for revision 115862:
  Using python's ``doctest`` module instead of deprecated ``zope.testing.doctest``.
  
  

Changed:
  U   zope.server/trunk/CHANGES.txt
  U   zope.server/trunk/src/zope/server/tests/test_serverbase.py

-=-
Modified: zope.server/trunk/CHANGES.txt
===================================================================
--- zope.server/trunk/CHANGES.txt	2010-08-23 05:48:46 UTC (rev 115861)
+++ zope.server/trunk/CHANGES.txt	2010-08-23 06:01:11 UTC (rev 115862)
@@ -6,7 +6,8 @@
 3.8.1 (unreleased)
 ------------------
 
-- No changes yet.
+- Using python's ``doctest`` module instead of deprecated
+  ``zope.testing.doctest``.
 
 3.8.0 (2010-08-05)
 ------------------

Modified: zope.server/trunk/src/zope/server/tests/test_serverbase.py
===================================================================
--- zope.server/trunk/src/zope/server/tests/test_serverbase.py	2010-08-23 05:48:46 UTC (rev 115861)
+++ zope.server/trunk/src/zope/server/tests/test_serverbase.py	2010-08-23 06:01:11 UTC (rev 115862)
@@ -13,11 +13,10 @@
 ##############################################################################
 """Tests for zope.server.serverbase
 """
+import doctest
 import unittest
 
-from zope.testing import doctest
 
-
 def doctest_ServerBase():
     r"""Regression test for ServerBase
 
@@ -46,8 +45,8 @@
     def send(self, data):
         self.data += data
         return len(data)
-    
 
+
 def channels_accept_iterables():
     r"""
 Channels accept iterables (they special-case strings).
@@ -58,14 +57,14 @@
 
     >>> channel.write("First")
     5
-    
+
     >>> channel.flush()
     >>> print socket.data
     First
 
     >>> channel.write(["\n", "Second", "\n", "Third"])
     13
-    
+
     >>> channel.flush()
     >>> print socket.data
     First
@@ -78,7 +77,7 @@
 
     >>> channel.write(count())
     33
-    
+
     >>> channel.flush()
     >>> print socket.data
     First
@@ -88,7 +87,7 @@
     2
     3
     I love to count. Ha ha ha.
-    
+
 """
 
 def test_suite():