From 783df8d49192846c6ac2cc646b210916d5daf9eb Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Mon, 28 Jun 2010 17:35:17 +0000 Subject: Merged revisions 82336 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r82336 | senthil.kumaran | 2010-06-28 23:01:40 +0530 (Mon, 28 Jun 2010) | 9 lines 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. ........ ................ --- Doc/library/urllib.request.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index d153384..64e0c2a 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -40,8 +40,8 @@ The :mod:`urllib.request` module defines the following functions: 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 :class:`http.client.HTTPMessage` instance (see `Quick - Reference to HTTP Headers `_) + in the form of an :func:`email.message_from_string` instance (see + `Quick Reference to HTTP Headers `_) Raises :exc:`URLError` on errors. -- cgit v0.12