Mercurial > cpython-lru_cache-weakref

diff Doc/library/basehttpserver.rst @ 47310:662d15af52df legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add renaming notices to 3.0 http package members.
author Georg Brandl <georg@python.org>
date Mon, 26 May 2008 15:01:48 +0000
parents ba1fa511b72d
children 30834b9aa193
line wrap: on
line diff
--- a/Doc/library/basehttpserver.rst	Mon May 26 14:51:54 2008 +0000
+++ b/Doc/library/basehttpserver.rst	Mon May 26 15:01:48 2008 +0000
@@ -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