[Python-checkins] r63691 - in python/trunk/Doc/library: basehttpserver.rst cgihttpserver.rst cookie.rst cookielib.rst httplib.rst simplehttpserver.rst
georg.brandl
python-checkins at python.org
Mon May 26 17:02:22 CEST 2008
Author: georg.brandl
Date: Mon May 26 17:01:48 2008
New Revision: 63691
Log:
Add renaming notices to 3.0 http package members.
Modified:
python/trunk/Doc/library/basehttpserver.rst
python/trunk/Doc/library/cgihttpserver.rst
python/trunk/Doc/library/cookie.rst
python/trunk/Doc/library/cookielib.rst
python/trunk/Doc/library/httplib.rst
python/trunk/Doc/library/simplehttpserver.rst
Modified: python/trunk/Doc/library/basehttpserver.rst
==============================================================================
--- python/trunk/Doc/library/basehttpserver.rst (original)
+++ python/trunk/Doc/library/basehttpserver.rst Mon May 26 17:01:48 2008
@@ -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
Modified: python/trunk/Doc/library/cgihttpserver.rst
==============================================================================
--- python/trunk/Doc/library/cgihttpserver.rst (original)
+++ python/trunk/Doc/library/cgihttpserver.rst Mon May 26 17:01:48 2008
@@ -1,4 +1,3 @@
-
:mod:`CGIHTTPServer` --- CGI-capable HTTP request handler
=========================================================
@@ -7,6 +6,11 @@
scripts.
.. sectionauthor:: Moshe Zadka <moshez at 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
Modified: python/trunk/Doc/library/cookie.rst
==============================================================================
--- python/trunk/Doc/library/cookie.rst (original)
+++ python/trunk/Doc/library/cookie.rst Mon May 26 17:01:48 2008
@@ -1,4 +1,3 @@
-
:mod:`Cookie` --- HTTP state management
=======================================
@@ -7,6 +6,11 @@
.. moduleauthor:: Timothy O'Malley <timo at alum.mit.edu>
.. sectionauthor:: Moshe Zadka <moshez at 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
Modified: python/trunk/Doc/library/cookielib.rst
==============================================================================
--- python/trunk/Doc/library/cookielib.rst (original)
+++ python/trunk/Doc/library/cookielib.rst Mon May 26 17:01:48 2008
@@ -1,4 +1,3 @@
-
:mod:`cookielib` --- Cookie handling for HTTP clients
=====================================================
@@ -7,6 +6,11 @@
.. moduleauthor:: John J. Lee <jjl at pobox.com>
.. sectionauthor:: John J. Lee <jjl at 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
Modified: python/trunk/Doc/library/httplib.rst
==============================================================================
--- python/trunk/Doc/library/httplib.rst (original)
+++ python/trunk/Doc/library/httplib.rst Mon May 26 17:01:48 2008
@@ -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
Modified: python/trunk/Doc/library/simplehttpserver.rst
==============================================================================
--- python/trunk/Doc/library/simplehttpserver.rst (original)
+++ python/trunk/Doc/library/simplehttpserver.rst Mon May 26 17:01:48 2008
@@ -6,6 +6,11 @@
:synopsis: This module provides a basic request handler for HTTP servers.
.. sectionauthor:: Moshe Zadka <moshez at 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
More information about the Python-checkins
mailing list