From 8de9119447c72db518196f0ddcdfc1cceaff1c1c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 26 May 2008 15:01:48 +0000 Subject: Add renaming notices to 3.0 http package members. --- Doc/library/basehttpserver.rst | 6 +++++- Doc/library/cgihttpserver.rst | 6 +++++- Doc/library/cookie.rst | 6 +++++- Doc/library/cookielib.rst | 6 +++++- Doc/library/httplib.rst | 6 +++++- 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 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 diff --git a/Doc/library/cgihttpserver.rst b/Doc/library/cgihttpserver.rst index 6275c1a..6abfde5 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 +.. 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 72400fc..aae7bc2 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 .. sectionauthor:: Moshe Zadka +.. 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 4a91953..bf166f6 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 .. sectionauthor:: John J. Lee +.. 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 9d6baba..ce6222b 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 3c2d72b..bdf66d1 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 +.. 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 -- cgit v0.12