summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2011-04-16 12:34:29 (GMT)
committerEli Bendersky <eliben@gmail.com>2011-04-16 12:34:29 (GMT)
commit3384e54c23299da91e27cf08ab621e3597c41348 (patch)
tree6d19c82b27bcec62db30bc44712d78ba4a0946f8 /Doc
parentf05c1394fe3c27e0fe33db984cf2f8bd9a4a1d47 (diff)
parent219cc776f6420c9cc9c3c5e96960d25fc42546a3 (diff)
downloadcpython-3384e54c23299da91e27cf08ab621e3597c41348.zip
cpython-3384e54c23299da91e27cf08ab621e3597c41348.tar.gz
cpython-3384e54c23299da91e27cf08ab621e3597c41348.tar.bz2
Issue #11855: merge from 3.1
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/urllib.request.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 9a905c6..3e24956 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1113,15 +1113,15 @@ some point in the future.
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()