[Python-checkins] r82364 - in python/branches/release26-maint: Doc/library/urllib.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Tue Jun 29 15:31:48 2010
New Revision: 82364

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/urllib.rst

Modified: python/branches/release26-maint/Doc/library/urllib.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/urllib.rst	(original)
+++ python/branches/release26-maint/Doc/library/urllib.rst	Tue Jun 29 15:31:48 2010
@@ -49,7 +49,7 @@
    .. 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