[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server/tests - testHTTPServer.py:1.1.2.13

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/Server/tests
In directory cvs.zope.org:/tmp/cvs-serv11304/tests

Modified Files:
      Tag: Zope-3x-branch
	testHTTPServer.py 
Log Message:
- Factored the non-HTTP-specific code into ServerBase, in preparation for
  an FTP server.

- Added explicit interfaces and docstrings.

- Updated licenses.


=== Zope3/lib/python/Zope/Server/tests/testHTTPServer.py 1.1.2.12 => 1.1.2.13 ===
+# Copyright 2001-2002 Zope Corporation and Contributors.  All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
@@ -14,7 +14,7 @@
 from Zope.Server.medusa.thread import select_trigger
 from threading import Thread
 from Zope.Server.TaskThreads import ThreadedTaskDispatcher
-from Zope.Server.HTTPServer import http_task, http_channel, http_server
+from Zope.Server.HTTPServer import HTTPTask, HTTPServerChannel, HTTPServer
 from Zope.Server.Adjustments import Adjustments
 from Zope.Server.ITask import ITask
 
@@ -36,7 +36,7 @@
 my_adj.inbuf_overflow = 10000
 
 
-class EchoHTTPTask (http_task):
+class EchoHTTPTask (HTTPTask):
 
     def execute(self):
         headers = self.request_data.headers
@@ -51,12 +51,12 @@
             self.write(data)
 
 
-class EchoHTTPChannel (http_channel):
+class EchoHTTPChannel (HTTPServerChannel):
 
     task_class = EchoHTTPTask
 
 
-class EchoHTTPServer (http_server):
+class EchoHTTPServer (HTTPServer):
 
     channel_class = EchoHTTPChannel