summaryrefslogtreecommitdiffstats
path: root/Doc/library/basehttpserver.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-05-26 15:01:48 (GMT)
committerGeorg Brandl <georg@python.org>2008-05-26 15:01:48 (GMT)
commit8de9119447c72db518196f0ddcdfc1cceaff1c1c (patch)
tree966b2bfa473bdf5bbb659d449a55024f719bd2ac /Doc/library/basehttpserver.rst
parent8b12ee10725210455d8bedce0c2a452de7ad2244 (diff)
downloadcpython-8de9119447c72db518196f0ddcdfc1cceaff1c1c.zip
cpython-8de9119447c72db518196f0ddcdfc1cceaff1c1c.tar.gz
cpython-8de9119447c72db518196f0ddcdfc1cceaff1c1c.tar.bz2
Add renaming notices to 3.0 http package members.
Diffstat (limited to 'Doc/library/basehttpserver.rst')
-rw-r--r--Doc/library/basehttpserver.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/library/basehttpserver.rst b/Doc/library/basehttpserver.rst
index 0fbf8b0..c922d2f 100644
--- 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