summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2008-12-27 15:50:40 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2008-12-27 15:50:40 (GMT)
commitdb5fe667311745a2bc86355620354449721545f3 (patch)
treea33cb5639ac9b87911c0a934ba5a42737c3df671 /Doc/library
parentd88e8fab148359a85f8e2a110a850c74e8ed5244 (diff)
downloadcpython-db5fe667311745a2bc86355620354449721545f3.zip
cpython-db5fe667311745a2bc86355620354449721545f3.tar.gz
cpython-db5fe667311745a2bc86355620354449721545f3.tar.bz2
Merged revisions 67946 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67946 | antoine.pitrou | 2008-12-27 16:43:12 +0100 (sam., 27 déc. 2008) | 4 lines Issue #4756: zipfile.is_zipfile() now supports file-like objects. Patch by Gabriel Genellina. ........
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/zipfile.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 49267c0..75860cc 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -64,9 +64,11 @@ The module defines the following items:
.. function:: is_zipfile(filename)
Returns ``True`` if *filename* is a valid ZIP file based on its magic number,
- otherwise returns ``False``. This module does not currently handle ZIP files
- which have appended comments.
+ otherwise returns ``False``. *filename* may be a file or file-like object too.
+ This module does not currently handle ZIP files which have appended comments.
+ .. versionchanged:: 2.7
+ Support for file and file-like objects.
.. data:: ZIP_STORED