Mercurial > moin > 1.9
changeset 3883:9e40b4ecf68f
merged some 1.7 changesets
author | Thomas Waldmann <tw AT waldmann-edv DOT de> |
---|---|
date | Sun, 27 Jul 2008 13:38:06 +0200 |
parents | 15bd8dae9003 (current diff) c8ffd029ab1f (diff) |
children | f85cd27073a9 |
files | MoinMoin/action/_tests/test_cache.py MoinMoin/action/cache.py docs/CHANGES |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/action/cache.py Sun Jul 27 13:21:17 2008 +0200 +++ b/MoinMoin/action/cache.py Sun Jul 27 13:38:06 2008 +0200 @@ -107,8 +107,7 @@ content_type=None, content_disposition=None, content_length=None, - last_modified=None, - bufsize=8192): + last_modified=None): """ Put an object into the cache to send it with cache action later. @@ -117,10 +116,10 @@ @param data: content data (str or open file-like obj) @param filename: filename for content-disposition header and for autodetecting content_type (unicode, default: None) + @param content_type: content-type header value (str, default: autodetect from filename) @param content_disposition: type for content-disposition header (str, default: None) - @param content_type: content-type header value (str, default: autodetect from filename) + @param content_length: data length for content-length header (int, default: autodetect) @param last_modified: last modified timestamp (int, default: autodetect) - @param content_length: data length for content-length header (int, default: autodetect) """ import os.path from MoinMoin.util import timefuncs