Add renaming notices to 3.0 http package members.

diff --git a/Doc/library/basehttpserver.rst b/Doc/library/basehttpserver.rst
index 0fbf8b0687dfab2ad8fa5f98e359171303891548..c922d2f53558d72ca7317f92b08f1f907d9c51b6 100644 (file)
--- a/Doc/library/basehttpserver.rst
+++ b/Doc/library/basehttpserver.rst
@@ -1,10 +1,14 @@
-
 :mod:`BaseHTTPServer` --- Basic HTTP server
 ===========================================
 
 .. module:: BaseHTTPServer
    :synopsis: Basic HTTP server (base class for SimpleHTTPServer and CGIHTTPServer).
 
+.. note::
+   The :mod:`BaseHTTPServer` module has been merged into :mod:`http.server` in
+   Python 3.0.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to 3.0.
+
 
 .. index::
    pair: WWW; server

diff --git a/Doc/library/cgihttpserver.rst b/Doc/library/cgihttpserver.rst
index 6275c1a4d18a7fb6450aa7d75f25b022ea05c1a4..6abfde5d31d6a817bd1212047ddc4808505934ce 100644 (file)
--- a/Doc/library/cgihttpserver.rst
+++ b/Doc/library/cgihttpserver.rst
@@ -1,4 +1,3 @@
-
 :mod:`CGIHTTPServer` --- CGI-capable HTTP request handler
 =========================================================
 
@@ -7,6 +6,11 @@
               scripts.
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
+.. note::
+   The :mod:`CGIHTTPServer` module has been merged into :mod:`http.server` in
+   Python 3.0.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to 3.0.
+
 
 The :mod:`CGIHTTPServer` module defines a request-handler class, interface
 compatible with :class:`BaseHTTPServer.BaseHTTPRequestHandler` and inherits

diff --git a/Doc/library/cookie.rst b/Doc/library/cookie.rst
index 72400fcd7edd83225da3710981c31996a05ab585..aae7bc27475442c71b14c3fdbedca980aabef8ed 100644 (file)
--- a/Doc/library/cookie.rst
+++ b/Doc/library/cookie.rst
@@ -1,4 +1,3 @@
-
 :mod:`Cookie` --- HTTP state management
 =======================================
 
@@ -7,6 +6,11 @@
 .. moduleauthor:: Timothy O'Malley <timo@alum.mit.edu>
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
+.. note::
+   The :mod:`Cookie` module has been renamed to :mod:`http.cookies` in Python
+   3.0.  The :term:`2to3` tool will automatically adapt imports when converting
+   your sources to 3.0.
+
 
 The :mod:`Cookie` module defines classes for abstracting the concept of
 cookies, an HTTP state management mechanism. It supports both simple string-only

diff --git a/Doc/library/cookielib.rst b/Doc/library/cookielib.rst
index 4a919537c6006ae6ef370d2264e2c3d7658c4a43..bf166f660e637b6f78650bac9cd603488f7173cb 100644 (file)
--- a/Doc/library/cookielib.rst
+++ b/Doc/library/cookielib.rst
@@ -1,4 +1,3 @@
-
 :mod:`cookielib` --- Cookie handling for HTTP clients
 =====================================================
 
@@ -7,6 +6,11 @@
 .. moduleauthor:: John J. Lee <jjl@pobox.com>
 .. sectionauthor:: John J. Lee <jjl@pobox.com>
 
+.. note::
+   The :mod:`cookielib` module has been renamed to :mod:`http.cookiejar` in
+   Python 3.0.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to 3.0.
+
 
 .. versionadded:: 2.4
 

diff --git a/Doc/library/httplib.rst b/Doc/library/httplib.rst
index 9d6baba2220484d053d18194a0f739eb477a9942..ce6222b2620032daf7668f53778f7ce6a24c948c 100644 (file)
--- a/Doc/library/httplib.rst
+++ b/Doc/library/httplib.rst
@@ -1,10 +1,14 @@
-
 :mod:`httplib` --- HTTP protocol client
 =======================================
 
 .. module:: httplib
    :synopsis: HTTP and HTTPS protocol client (requires sockets).
 
+.. note::
+   The :mod:`httplib` module has been renamed to :mod:`http.client` in Python
+   3.0.  The :term:`2to3` tool will automatically adapt imports when converting
+   your sources to 3.0.
+
 
 .. index::
    pair: HTTP; protocol

diff --git a/Doc/library/simplehttpserver.rst b/Doc/library/simplehttpserver.rst
index 3c2d72b88768f60ee4a1628a3d24765c79693acd..bdf66d1cbb4397026d7c81d72bda0f6cab2f82f6 100644 (file)
--- a/Doc/library/simplehttpserver.rst
+++ b/Doc/library/simplehttpserver.rst
@@ -6,6 +6,11 @@
    :synopsis: This module provides a basic request handler for HTTP servers.
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
+.. note::
+   The :mod:`SimpleHTTPServer` module has been merged into :mod:`http.server` in
+   Python 3.0.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to 3.0.
+
 
 The :mod:`SimpleHTTPServer` module defines a single class,
 :class:`SimpleHTTPRequestHandler`, which is interface-compatible with