diff options
| -rw-r--r-- | Doc/library/basehttpserver.rst | 6 | ||||
| -rw-r--r-- | Doc/library/cgihttpserver.rst | 6 | ||||
| -rw-r--r-- | Doc/library/cookie.rst | 6 | ||||
| -rw-r--r-- | Doc/library/cookielib.rst | 6 | ||||
| -rw-r--r-- | Doc/library/httplib.rst | 6 | ||||
| -rw-r--r-- | Doc/library/simplehttpserver.rst | 5 |
6 files changed, 30 insertions, 5 deletions
diff --git a/Doc/library/basehttpserver.rst b/Doc/library/basehttpserver.rst index 0fbf8b0687..c922d2f535 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 diff --git a/Doc/library/cgihttpserver.rst b/Doc/library/cgihttpserver.rst index 6275c1a4d1..6abfde5d31 100644 --- 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 72400fcd7e..aae7bc2747 100644 --- 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 4a919537c6..bf166f660e 100644 --- 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 9d6baba222..ce6222b262 100644 --- 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 3c2d72b887..bdf66d1cbb 100644 --- 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 |