Add the http and xmlrpc packages.

pep-3108.txt

@@ -371,14 +371,11 @@ Current Name        Replacement Name
 _winreg             winreg (rename also because module has a public
                     interface and thus should not have a leading
                     underscore)
-BaseHTTPServer      base_http_server
 Carbon              carbon
-CGIHTTPServer       cgi_http_server
 ColorPicker         colorpicker
 ConfigParser        configparser
 Cookie              cookie
 copy_reg            copyreg
-DocXMLRPCServer     doc_xmlrpc_server
 EasyDialogs         easydialogs
 HTMLParser          htmlparser
 MacOS               macos
@@ -386,8 +383,6 @@ Nav                 nav
 PixMapWrapper       pixmap_wrapper
 Queue               queue
 ScrolledText        scrolledtext
-SimpleHTTPServer    simple_http_server
-SimpleXMLRPCServer  simple_xmlrpc_server
 SocketServer        socketserver
 Tix                 tix
 Tkinter             tkinter
@@ -432,6 +427,7 @@ Issues`_ for a discussion on this.
 
   + Added to the 'io' module as stringio.
 
+
 No public, documented interface
 -------------------------------
 
@@ -446,10 +442,11 @@ Current Name  Replacement Name
 bdb           _bdb
 markupbase    _markupbase [done]
 opcode        _opcode
-dummy_thread  _dummy_thread (assuming thread
-              is deprecated)
+dummy_thread  _dummy_thread [#]_
 ============  ===============================
 
+.. [#] Assumes ``thread`` is renamed to ``_thread``.
+
 
 Poorly chosen names
 -------------------
@@ -493,6 +490,38 @@ whichdb            dbm.tools [1]_
        API for both modules has no name conflict.
 
 
+http package
+////////////
+
+=================  ===============================
+Current Name       Replacement Name
+=================  ===============================
+httplib            http.tools
+BaseHTTPServer     http.server [2]_
+CGIHTTPServer      http.server [2]_
+SimpleHTTPServer   http.server [2]_
+cookielib          http.cookies
+=================  ===============================
+
+.. [2] The ``http.server`` module can combine the specified modules
+       safely as they have no naming conflicts.
+       
+       
+xmlrpc package
+//////////////
+
+==================  ===============================
+Current Name        Replacement Name
+==================  ===============================
+xmlrpclib           xmlrpc.tools
+SimpleXMLRPCServer  xmlrpc.server [3]_
+CGIXMLRPCServer     xmlrpc.server [3]_
+==================  ===============================
+
+.. [3] The modules being combined into ``xmlrpc.server`` have no
+       naming conflicts and thus can safely be merged.
+
+
 Transition Plan
 ===============