[Python-checkins] cpython (merge 3.5 -> default): Issue #27311: Merge zipfile doc from 3.5
martin.panter
python-checkins at python.org
Tue Jun 14 21:14:08 EDT 2016
https://hg.python.org/cpython/rev/e3bb87952c62
changeset: 102046:e3bb87952c62
parent: 102044:cd68cf41adf2
parent: 102045:32af78a8b88f
user: Martin Panter <vadmium+py at gmail.com>
date: Wed Jun 15 01:05:27 2016 +0000
summary:
Issue #27311: Merge zipfile doc from 3.5
files:
Doc/library/zipfile.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -348,9 +348,9 @@
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.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list