summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2008-01-20 01:32:00 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2008-01-20 01:32:00 (GMT)
commitda407232e02e4d983f72801803faa6d25b2a8162 (patch)
tree97dff7393900e4f6175760996d04416e9a3727dc
parentf25680afd0df91a6e9025f9813bf53614dda5f25 (diff)
downloadcpython-da407232e02e4d983f72801803faa6d25b2a8162.zip
cpython-da407232e02e4d983f72801803faa6d25b2a8162.tar.gz
cpython-da407232e02e4d983f72801803faa6d25b2a8162.tar.bz2
Document that zipfile decryption is insanely slow and fix a typo and
blatant lie in a docstring (it is not useful for security regardless of how you spell it).
-rw-r--r--Doc/library/zipfile.rst3
-rw-r--r--Lib/zipfile.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index f1cfc1b..e3c852b 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -21,7 +21,8 @@ added to individual archive members---for which see the :ref:`zipinfo-objects`
documentation). It can handle ZIP files that use the ZIP64 extensions
(that is ZIP files that are more than 4 GByte in size). It supports
decryption of encrypted files in ZIP archives, but it currently cannot
-create an encrypted file.
+create an encrypted file. Decryption is extremely slow as it is
+implemented in native python rather than C.
For other archive formats, see the :mod:`bz2`, :mod:`gzip`, and
:mod:`tarfile` modules.
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 6feabbf..9f5669e 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -302,7 +302,7 @@ class _ZipDecrypter:
ZIP supports a password-based form of encryption. Even though known
plaintext attacks have been found against it, it is still useful
- for low-level securicy.
+ to be able to get data out of such a file.
Usage:
zd = _ZipDecrypter(mypwd)