Merged revisions 82363 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82363 | senthil.kumaran | 2010-06-29 18:58:20 +0530 (Tue, 29 Jun 2010) | 3 lines

  Documentation Fix: urllib.urlopen.info uses mimetools.Message, not httplib.HTTPMessage.
........

diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 9666819e4eb93b6d54617a0403419fc7b3127484..d3e503f7e1ce0265986ab2292f6c3f102ea43dae 100644 (file)
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -49,7 +49,7 @@ High-level interface
    .. index:: module: mimetools
 
    The :meth:`info` method returns an instance of the class
-   :class:`httplib.HTTPMessage` containing meta-information associated with the
+   :class:`mimetools.Message` containing meta-information associated with the
    URL.  When the method is HTTP, these headers are those returned by the server
    at the head of the retrieved HTML page (including Content-Length and
    Content-Type).  When the method is FTP, a Content-Length header will be