(original) (raw)

changeset: 69390:0f1199858714 branch: 3.2 parent: 69385:033dd346df57 parent: 69389:a6d9f9329070 user: Eli Bendersky eliben@gmail.com date: Sat Apr 16 15:34:29 2011 +0300 files: Doc/library/urllib.request.rst description: Issue #11855: merge from 3.1 diff -r 033dd346df57 -r 0f1199858714 Doc/library/urllib.request.rst --- a/Doc/library/urllib.request.rst Fri Apr 15 17:43:57 2011 -0700 +++ b/Doc/library/urllib.request.rst Sat Apr 16 15:34:29 2011 +0300 @@ -1113,15 +1113,15 @@ the download is interrupted. The *Content-Length* is treated as a lower bound: if there's more data to read, - urlretrieve reads more data, but if less data is available, it raises the - exception. + :func:`urlretrieve` reads more data, but if less data is available, it raises + the exception. You can still retrieve the downloaded data in this case, it is stored in the :attr:`content` attribute of the exception instance. - If no *Content-Length* header was supplied, urlretrieve can not check the size - of the data it has downloaded, and just returns it. In this case you just have - to assume that the download was successful. + If no *Content-Length* header was supplied, :func:`urlretrieve` can not check + the size of the data it has downloaded, and just returns it. In this case + you just have to assume that the download was successful. .. function:: urlcleanup() /eliben@gmail.com