Merged revisions 82334 via svnmerge from

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

........
  r82334 | senthil.kumaran | 2010-06-28 22:37:40 +0530 (Mon, 28 Jun 2010) | 3 lines

  Documentation correction. urllib2.urlopen.info returns a mimetools.Message instance not HTTPMessage object.
........

diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
index fb3383dec9ce16ec60ed31d16260e8806fe8e4bd..7fcce4f79163ea3ca48a90234e016b92460b0447 100644 (file)
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -43,8 +43,8 @@ The :mod:`urllib2` module defines the following functions:
    * :meth:`geturl` --- return the URL of the resource retrieved, commonly used to
      determine if a redirect was followed
 
-   * :meth:`info` --- return the meta-information of the page, such as headers, in
-     the form of an ``httplib.HTTPMessage`` instance
+   * :meth:`info` --- return the meta-information of the page, such as headers,
+     in the form of an :class:`mimetools.Message` instance
      (see `Quick Reference to HTTP Headers <http://www.cs.tut.fi/~jkorpela/http.html>`_)
 
    Raises :exc:`URLError` on errors.