Issue #6972: fix the documentation mis applied patch.
This commit is contained in:
parent
35c52b687f
commit
a26ec65d93
|
@ -213,6 +213,16 @@ ZipFile Objects
|
||||||
|
|
||||||
.. versionadded:: 2.6
|
.. versionadded:: 2.6
|
||||||
|
|
||||||
|
.. note::
|
||||||
|
|
||||||
|
If a member filename is an absolute path, a drive/UNC sharepoint and
|
||||||
|
leading (back)slashes will be stripped, e.g.: ``///foo/bar`` becomes
|
||||||
|
``foo/bar`` on Unix, and ``C:\foo\bar`` becomes ``foo\bar`` on Windows.
|
||||||
|
And all ``".."`` components in a member filename will be removed, e.g.:
|
||||||
|
``../../foo../../ba..r`` becomes ``foo../ba..r``. On Windows illegal
|
||||||
|
characters (``:``, ``<``, ``>``, ``|``, ``"``, ``?``, and ``*``)
|
||||||
|
replaced by underscore (``_``).
|
||||||
|
|
||||||
|
|
||||||
.. method:: ZipFile.extractall([path[, members[, pwd]]])
|
.. method:: ZipFile.extractall([path[, members[, pwd]]])
|
||||||
|
|
||||||
|
@ -228,6 +238,9 @@ ZipFile Objects
|
||||||
that have absolute filenames starting with ``"/"`` or filenames with two
|
that have absolute filenames starting with ``"/"`` or filenames with two
|
||||||
dots ``".."``.
|
dots ``".."``.
|
||||||
|
|
||||||
|
.. versionchanged:: 2.7.4
|
||||||
|
The zipfile module attempts to prevent that. See :meth:`extract` note.
|
||||||
|
|
||||||
.. versionadded:: 2.6
|
.. versionadded:: 2.6
|
||||||
|
|
||||||
|
|
||||||
|
@ -242,16 +255,6 @@ ZipFile Objects
|
||||||
|
|
||||||
.. versionadded:: 2.6
|
.. versionadded:: 2.6
|
||||||
|
|
||||||
.. note::
|
|
||||||
|
|
||||||
If a member filename is an absolute path, a drive/UNC sharepoint and
|
|
||||||
leading (back)slashes will be stripped, e.g.: ``///foo/bar`` becomes
|
|
||||||
``foo/bar`` on Unix, and ``C:\foo\bar`` becomes ``foo\bar`` on Windows.
|
|
||||||
And all ``".."`` components in a member filename will be removed, e.g.:
|
|
||||||
``../../foo../../ba..r`` becomes ``foo../ba..r``. On Windows illegal
|
|
||||||
characters (``:``, ``<``, ``>``, ``|``, ``"``, ``?``, and ``*``)
|
|
||||||
replaced by underscore (``_``).
|
|
||||||
|
|
||||||
|
|
||||||
.. method:: ZipFile.read(name[, pwd])
|
.. method:: ZipFile.read(name[, pwd])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue