mirror of https://github.com/python/cpython
Fix 1698398: Zipfile.printdir() crashed because the format string expected a tuple object of length six instead of a time.struct_time object.
This commit is contained in:
parent
b9c741c43c
commit
665ddc9bb3
|
@ -445,7 +445,7 @@ class ZipFile:
|
|||
"""Print a table of contents for the zip file."""
|
||||
print "%-46s %19s %12s" % ("File Name", "Modified ", "Size")
|
||||
for zinfo in self.filelist:
|
||||
date = "%d-%02d-%02d %02d:%02d:%02d" % zinfo.date_time
|
||||
date = "%d-%02d-%02d %02d:%02d:%02d" % zinfo.date_time[:6]
|
||||
print "%-46s %s %12d" % (zinfo.filename, date, zinfo.file_size)
|
||||
|
||||
def testzip(self):
|
||||
|
@ -606,7 +606,7 @@ class ZipFile:
|
|||
the name of the file in the archive."""
|
||||
if not isinstance(zinfo_or_arcname, ZipInfo):
|
||||
zinfo = ZipInfo(filename=zinfo_or_arcname,
|
||||
date_time=time.localtime(time.time()))
|
||||
date_time=time.localtime(time.time())[:6])
|
||||
zinfo.compress_type = self.compression
|
||||
else:
|
||||
zinfo = zinfo_or_arcname
|
||||
|
|
|
@ -414,6 +414,9 @@ Extension Modules
|
|||
|
||||
- Bug #1653736: Fix signature of time_isoformat.
|
||||
|
||||
- Issue #1698398 Zipfile.printdir() crashed because the format string
|
||||
expected a tuple type of length six instead of time.struct_time object.
|
||||
|
||||
- operator.count() now raises an OverflowError when the count reaches sys.maxint.
|
||||
|
||||
- Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
|
||||
|
|
Loading…
Reference in New Issue