summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2011-04-16 12:36:26 (GMT)
committerEli Bendersky <eliben@gmail.com>2011-04-16 12:36:26 (GMT)
commit5145ed585901de0af2647b0554bebebe0ca20dda (patch)
tree4e0ee1e1a215e1b1598ba0bf26a7cbbe2ff134cf /Doc
parent4c2ffab80b5dac8790c9c7219181db13a4ace07f (diff)
parent3384e54c23299da91e27cf08ab621e3597c41348 (diff)
downloadcpython-5145ed585901de0af2647b0554bebebe0ca20dda.zip
cpython-5145ed585901de0af2647b0554bebebe0ca20dda.tar.gz
cpython-5145ed585901de0af2647b0554bebebe0ca20dda.tar.bz2
Issue #11855: merge from 3.2
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()