[Python-checkins] r82337 - in python/branches/release31-maint: Doc/library/urllib.request.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Mon Jun 28 19:35:17 2010
New Revision: 82337

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


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

Modified: python/branches/release31-maint/Doc/library/urllib.request.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.request.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.request.rst	Mon Jun 28 19:35:17 2010
@@ -40,8 +40,8 @@
      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 <http://www.cs.tut.fi/~jkorpela/http.html>`_)
+     in the form of an :func:`email.message_from_string` instance (see
+     `Quick Reference to HTTP Headers <http://www.cs.tut.fi/~jkorpela/http.html>`_)
 
    Raises :exc:`URLError` on errors.