From: Senthil Kumaran Date: Tue, 29 Jun 2010 13:31:48 +0000 (+0000) Subject: Merged revisions 82363 via svnmerge from X-Git-Tag: v2.6.6rc1~159 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34d2ebec5fb16626a3b2b1c57e83e2e1bfa2964c;p=thirdparty%2FPython%2Fcpython.git 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 9666819e4eb9..d3e503f7e1ce 100644 --- 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