diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 20:05:12 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 20:05:12 (GMT) |
| commit | d39a4d755a34395fef165a50cdefb490d94d346b (patch) | |
| tree | e6a81c1e4275ba212652f4bd583cba8cca7092ae /Doc/library/urllib.request.rst | |
| parent | 46f5d146c157f1a30c48aced22269271bb754b35 (diff) | |
| parent | 83386dac8b84b8fe1c4e28948eba2aba513e5a1c (diff) | |
| download | cpython-d39a4d755a34395fef165a50cdefb490d94d346b.zip cpython-d39a4d755a34395fef165a50cdefb490d94d346b.tar.gz cpython-d39a4d755a34395fef165a50cdefb490d94d346b.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Doc/library/urllib.request.rst')
| -rw-r--r-- | Doc/library/urllib.request.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index b69b3b3..6dc1ff0 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -1288,11 +1288,11 @@ some point in the future. pair: HTTP; protocol pair: FTP; protocol -* Currently, only the following protocols are supported: HTTP, (versions 0.9 and - 1.0), FTP, and local files. +* Currently, only the following protocols are supported: HTTP (versions 0.9 and + 1.0), FTP, and local files. -* The caching feature of :func:`urlretrieve` has been disabled until I find the - time to hack proper processing of Expiration time headers. +* The caching feature of :func:`urlretrieve` has been disabled until someone find + the time to hack proper processing of Expiration time headers. * There should be a function to query whether a particular URL is in the cache. |