diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-06-15 01:05:27 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-15 01:05:27 (GMT) |
| commit | 9a8b5ca2d703d22ad57b51eb417fca22725c1419 (patch) | |
| tree | 0ec63762e90bf9b249212bacf48d21eec66c6218 /Doc/library/zipfile.rst | |
| parent | e80b658dbf2b425753c100f96e488d65e7e8af7f (diff) | |
| parent | 71e86367e090a0d0595a4221c8334d87979488e6 (diff) | |
| download | cpython-9a8b5ca2d703d22ad57b51eb417fca22725c1419.zip cpython-9a8b5ca2d703d22ad57b51eb417fca22725c1419.tar.gz cpython-9a8b5ca2d703d22ad57b51eb417fca22725c1419.tar.bz2 | |
Issue #27311: Merge zipfile doc from 3.5
Diffstat (limited to 'Doc/library/zipfile.rst')
| -rw-r--r-- | Doc/library/zipfile.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst index a56cec5..c3e7aa0 100644 --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -348,9 +348,9 @@ ZipFile Objects If ``arcname`` (or ``filename``, if ``arcname`` is not given) contains a null byte, the name of the file in the archive will be truncated at the null byte. -.. method:: ZipFile.writestr(zinfo_or_arcname, bytes[, compress_type]) +.. method:: ZipFile.writestr(zinfo_or_arcname, data[, compress_type]) - Write the string *bytes* to the archive; *zinfo_or_arcname* is either the file + Write the string *data* to the archive; *zinfo_or_arcname* is either the file name it will be given in the archive, or a :class:`ZipInfo` instance. If it's an instance, at least the filename, date, and time must be given. If it's a name, the date and time is set to the current date and time. |