Merge 3.2

This commit is contained in:
Florent Xicluna 2011-10-28 22:05:12 +02:00
commit d39a4d755a
1 changed files with 4 additions and 4 deletions

View File

@ -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.