backport bug [ 957505 ] SocketServer module documentation misleading

diff --git a/Doc/lib/libsocksvr.tex b/Doc/lib/libsocksvr.tex
index b0cc4164ea62dc31408a6213b6933e4c494294c2..b21e804e03bc3c20d52b183767ffe440144cd2fa 100644 (file)
--- a/Doc/lib/libsocksvr.tex
+++ b/Doc/lib/libsocksvr.tex
@@ -95,8 +95,7 @@ To implement a service, you must derive a class from
 can then run various versions of the service by combining one of the server
 classes with your request handler class.  The request handler class must be
 different for datagram or stream services.  This can be hidden by using the
-mix-in request handler classes \class{StreamRequestHandler} or
-\class{DatagramRequestHandler}.
+handler subclasses \class{StreamRequestHandler} or \class{DatagramRequestHandler}.
 
 Of course, you still have to use your head!  For instance, it makes no sense
 to use a forking server if the service contains state in memory that can be
@@ -279,11 +278,10 @@ information.
 The type of \member{self.request} is different for datagram or stream
 services.  For stream services, \member{self.request} is a socket
 object; for datagram services, \member{self.request} is a string.
-However, this can be hidden by using the mix-in request handler
-classes
+However, this can be hidden by using the  request handler subclasses
 \class{StreamRequestHandler} or \class{DatagramRequestHandler}, which
 override the \method{setup()} and \method{finish()} methods, and
-provides \member{self.rfile} and \member{self.wfile} attributes.
+provide \member{self.rfile} and \member{self.wfile} attributes.
 \member{self.rfile} and \member{self.wfile} can be read or written,
 respectively, to get the request data or return data to the client.
 \end{funcdesc}

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 06ed134b0f39f866b53b96e517cc6f6c81dd59fb..c42d36ecf802c01829bece7c91c2301b749624bc 100644 (file)
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -65,8 +65,8 @@ various versions of the service by combining one of the server classes
 with your request handler class.
 
 The request handler class must be different for datagram or stream
-services.  This can be hidden by using the mix-in request handler
-classes StreamRequestHandler or DatagramRequestHandler.
+services.  This can be hidden by using the request handler
+subclasses StreamRequestHandler or DatagramRequestHandler.
 
 Of course, you still have to use your head!