Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
cpython
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
cpython
Commits
b76bcc4f
Kaydet (Commit)
b76bcc4f
authored
Ock 26, 2015
tarafından
Serhiy Storchaka
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Issue #14099: Backout changeset e5bb3044402b (except adapted tests).
üst
b6c0c5ba
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
80 deletions
+50
-80
zipfile.rst
Doc/library/zipfile.rst
+8
-2
test_zipfile.py
Lib/test/test_zipfile.py
+12
-18
zipfile.py
Lib/zipfile.py
+30
-55
NEWS
Misc/NEWS
+0
-5
No files found.
Doc/library/zipfile.rst
Dosyayı görüntüle @
b76bcc4f
...
@@ -219,8 +219,14 @@ ZipFile Objects
...
@@ -219,8 +219,14 @@ ZipFile Objects
..
note
::
..
note
::
Objects
returned
by
:
meth
:`.
open
`
can
operate
independently
of
the
If
the
ZipFile
was
created
by
passing
in
a
file
-
like
object
as
the
first
ZipFile
.
argument
to
the
constructor
,
then
the
object
returned
by
:
meth
:`.
open
`
shares
the
ZipFile
's file pointer. Under these circumstances, the object returned by
:meth:`.open` should not be used after any additional operations are performed
on the ZipFile object. If the ZipFile was created by passing in a string (the
filename) as the first argument to the constructor, then :meth:`.open` will
create a new file object that will be held by the ZipExtFile, allowing it to
operate independently of the ZipFile.
.. note::
.. note::
...
...
Lib/test/test_zipfile.py
Dosyayı görüntüle @
b76bcc4f
...
@@ -1653,9 +1653,8 @@ class TestsWithMultipleOpens(unittest.TestCase):
...
@@ -1653,9 +1653,8 @@ class TestsWithMultipleOpens(unittest.TestCase):
def
test_same_file
(
self
):
def
test_same_file
(
self
):
# Verify that (when the ZipFile is in control of creating file objects)
# Verify that (when the ZipFile is in control of creating file objects)
# multiple open() calls can be made without interfering with each other.
# multiple open() calls can be made without interfering with each other.
for
f
in
get_files
(
self
):
self
.
make_test_archive
(
TESTFN2
)
self
.
make_test_archive
(
f
)
with
zipfile
.
ZipFile
(
TESTFN2
,
mode
=
"r"
)
as
zipf
:
with
zipfile
.
ZipFile
(
f
,
mode
=
"r"
)
as
zipf
:
with
zipf
.
open
(
'ones'
)
as
zopen1
,
zipf
.
open
(
'ones'
)
as
zopen2
:
with
zipf
.
open
(
'ones'
)
as
zopen1
,
zipf
.
open
(
'ones'
)
as
zopen2
:
data1
=
zopen1
.
read
(
500
)
data1
=
zopen1
.
read
(
500
)
data2
=
zopen2
.
read
(
500
)
data2
=
zopen2
.
read
(
500
)
...
@@ -1667,9 +1666,8 @@ class TestsWithMultipleOpens(unittest.TestCase):
...
@@ -1667,9 +1666,8 @@ class TestsWithMultipleOpens(unittest.TestCase):
def
test_different_file
(
self
):
def
test_different_file
(
self
):
# Verify that (when the ZipFile is in control of creating file objects)
# Verify that (when the ZipFile is in control of creating file objects)
# multiple open() calls can be made without interfering with each other.
# multiple open() calls can be made without interfering with each other.
for
f
in
get_files
(
self
):
self
.
make_test_archive
(
TESTFN2
)
self
.
make_test_archive
(
f
)
with
zipfile
.
ZipFile
(
TESTFN2
,
mode
=
"r"
)
as
zipf
:
with
zipfile
.
ZipFile
(
f
,
mode
=
"r"
)
as
zipf
:
with
zipf
.
open
(
'ones'
)
as
zopen1
,
zipf
.
open
(
'twos'
)
as
zopen2
:
with
zipf
.
open
(
'ones'
)
as
zopen1
,
zipf
.
open
(
'twos'
)
as
zopen2
:
data1
=
zopen1
.
read
(
500
)
data1
=
zopen1
.
read
(
500
)
data2
=
zopen2
.
read
(
500
)
data2
=
zopen2
.
read
(
500
)
...
@@ -1681,9 +1679,8 @@ class TestsWithMultipleOpens(unittest.TestCase):
...
@@ -1681,9 +1679,8 @@ class TestsWithMultipleOpens(unittest.TestCase):
def
test_interleaved
(
self
):
def
test_interleaved
(
self
):
# Verify that (when the ZipFile is in control of creating file objects)
# Verify that (when the ZipFile is in control of creating file objects)
# multiple open() calls can be made without interfering with each other.
# multiple open() calls can be made without interfering with each other.
for
f
in
get_files
(
self
):
self
.
make_test_archive
(
TESTFN2
)
self
.
make_test_archive
(
f
)
with
zipfile
.
ZipFile
(
TESTFN2
,
mode
=
"r"
)
as
zipf
:
with
zipfile
.
ZipFile
(
f
,
mode
=
"r"
)
as
zipf
:
with
zipf
.
open
(
'ones'
)
as
zopen1
,
zipf
.
open
(
'twos'
)
as
zopen2
:
with
zipf
.
open
(
'ones'
)
as
zopen1
,
zipf
.
open
(
'twos'
)
as
zopen2
:
data1
=
zopen1
.
read
(
500
)
data1
=
zopen1
.
read
(
500
)
data2
=
zopen2
.
read
(
500
)
data2
=
zopen2
.
read
(
500
)
...
@@ -1693,10 +1690,9 @@ class TestsWithMultipleOpens(unittest.TestCase):
...
@@ -1693,10 +1690,9 @@ class TestsWithMultipleOpens(unittest.TestCase):
self
.
assertEqual
(
data2
,
self
.
data2
)
self
.
assertEqual
(
data2
,
self
.
data2
)
def
test_read_after_close
(
self
):
def
test_read_after_close
(
self
):
for
f
in
get_files
(
self
):
self
.
make_test_archive
(
TESTFN2
)
self
.
make_test_archive
(
f
)
with
contextlib
.
ExitStack
()
as
stack
:
with
contextlib
.
ExitStack
()
as
stack
:
with
zipfile
.
ZipFile
(
f
,
'r'
)
as
zipf
:
with
zipfile
.
ZipFile
(
TESTFN2
,
'r'
)
as
zipf
:
zopen1
=
stack
.
enter_context
(
zipf
.
open
(
'ones'
))
zopen1
=
stack
.
enter_context
(
zipf
.
open
(
'ones'
))
zopen2
=
stack
.
enter_context
(
zipf
.
open
(
'twos'
))
zopen2
=
stack
.
enter_context
(
zipf
.
open
(
'twos'
))
data1
=
zopen1
.
read
(
500
)
data1
=
zopen1
.
read
(
500
)
...
@@ -1707,27 +1703,25 @@ class TestsWithMultipleOpens(unittest.TestCase):
...
@@ -1707,27 +1703,25 @@ class TestsWithMultipleOpens(unittest.TestCase):
self
.
assertEqual
(
data2
,
self
.
data2
)
self
.
assertEqual
(
data2
,
self
.
data2
)
def
test_read_after_write
(
self
):
def
test_read_after_write
(
self
):
for
f
in
get_files
(
self
):
with
zipfile
.
ZipFile
(
TESTFN2
,
'w'
,
zipfile
.
ZIP_DEFLATED
)
as
zipf
:
with
zipfile
.
ZipFile
(
f
,
'w'
,
zipfile
.
ZIP_DEFLATED
)
as
zipf
:
zipf
.
writestr
(
'ones'
,
self
.
data1
)
zipf
.
writestr
(
'ones'
,
self
.
data1
)
zipf
.
writestr
(
'twos'
,
self
.
data2
)
zipf
.
writestr
(
'twos'
,
self
.
data2
)
with
zipf
.
open
(
'ones'
)
as
zopen1
:
with
zipf
.
open
(
'ones'
)
as
zopen1
:
data1
=
zopen1
.
read
(
500
)
data1
=
zopen1
.
read
(
500
)
self
.
assertEqual
(
data1
,
self
.
data1
[:
500
])
self
.
assertEqual
(
data1
,
self
.
data1
[:
500
])
with
zipfile
.
ZipFile
(
f
,
'r'
)
as
zipf
:
with
zipfile
.
ZipFile
(
TESTFN2
,
'r'
)
as
zipf
:
data1
=
zipf
.
read
(
'ones'
)
data1
=
zipf
.
read
(
'ones'
)
data2
=
zipf
.
read
(
'twos'
)
data2
=
zipf
.
read
(
'twos'
)
self
.
assertEqual
(
data1
,
self
.
data1
)
self
.
assertEqual
(
data1
,
self
.
data1
)
self
.
assertEqual
(
data2
,
self
.
data2
)
self
.
assertEqual
(
data2
,
self
.
data2
)
def
test_write_after_read
(
self
):
def
test_write_after_read
(
self
):
for
f
in
get_files
(
self
):
with
zipfile
.
ZipFile
(
TESTFN2
,
"w"
,
zipfile
.
ZIP_DEFLATED
)
as
zipf
:
with
zipfile
.
ZipFile
(
f
,
"w"
,
zipfile
.
ZIP_DEFLATED
)
as
zipf
:
zipf
.
writestr
(
'ones'
,
self
.
data1
)
zipf
.
writestr
(
'ones'
,
self
.
data1
)
with
zipf
.
open
(
'ones'
)
as
zopen1
:
with
zipf
.
open
(
'ones'
)
as
zopen1
:
zopen1
.
read
(
500
)
zopen1
.
read
(
500
)
zipf
.
writestr
(
'twos'
,
self
.
data2
)
zipf
.
writestr
(
'twos'
,
self
.
data2
)
with
zipfile
.
ZipFile
(
f
,
'r'
)
as
zipf
:
with
zipfile
.
ZipFile
(
TESTFN2
,
'r'
)
as
zipf
:
data1
=
zipf
.
read
(
'ones'
)
data1
=
zipf
.
read
(
'ones'
)
data2
=
zipf
.
read
(
'twos'
)
data2
=
zipf
.
read
(
'twos'
)
self
.
assertEqual
(
data1
,
self
.
data1
)
self
.
assertEqual
(
data1
,
self
.
data1
)
...
...
Lib/zipfile.py
Dosyayı görüntüle @
b76bcc4f
...
@@ -624,25 +624,6 @@ def _get_decompressor(compress_type):
...
@@ -624,25 +624,6 @@ def _get_decompressor(compress_type):
raise
NotImplementedError
(
"compression type
%
d"
%
(
compress_type
,))
raise
NotImplementedError
(
"compression type
%
d"
%
(
compress_type
,))
class
_SharedFile
:
def
__init__
(
self
,
file
,
pos
,
close
):
self
.
_file
=
file
self
.
_pos
=
pos
self
.
_close
=
close
def
read
(
self
,
n
=-
1
):
self
.
_file
.
seek
(
self
.
_pos
)
data
=
self
.
_file
.
read
(
n
)
self
.
_pos
=
self
.
_file
.
tell
()
return
data
def
close
(
self
):
if
self
.
_file
is
not
None
:
fileobj
=
self
.
_file
self
.
_file
=
None
self
.
_close
(
fileobj
)
class
ZipExtFile
(
io
.
BufferedIOBase
):
class
ZipExtFile
(
io
.
BufferedIOBase
):
"""File-like object for reading an archive member.
"""File-like object for reading an archive member.
Is returned by ZipFile.open().
Is returned by ZipFile.open().
...
@@ -928,7 +909,7 @@ class ZipFile:
...
@@ -928,7 +909,7 @@ class ZipFile:
self
.
NameToInfo
=
{}
# Find file info given name
self
.
NameToInfo
=
{}
# Find file info given name
self
.
filelist
=
[]
# List of ZipInfo instances for archive
self
.
filelist
=
[]
# List of ZipInfo instances for archive
self
.
compression
=
compression
# Method of compression
self
.
compression
=
compression
# Method of compression
self
.
mode
=
mode
self
.
mode
=
key
=
mode
.
replace
(
'b'
,
''
)[
0
]
self
.
pwd
=
None
self
.
pwd
=
None
self
.
_comment
=
b
''
self
.
_comment
=
b
''
...
@@ -937,33 +918,28 @@ class ZipFile:
...
@@ -937,33 +918,28 @@ class ZipFile:
# No, it's a filename
# No, it's a filename
self
.
_filePassed
=
0
self
.
_filePassed
=
0
self
.
filename
=
file
self
.
filename
=
file
modeDict
=
{
'r'
:
'rb'
,
'w'
:
'w+b'
,
'a'
:
'r+b'
,
modeDict
=
{
'r'
:
'rb'
,
'w'
:
'wb'
,
'a'
:
'r+b'
}
'r+b'
:
'w+b'
,
'w+b'
:
'wb'
}
filemode
=
modeDict
[
mode
]
while
True
:
try
:
try
:
self
.
fp
=
io
.
open
(
file
,
filemode
)
self
.
fp
=
io
.
open
(
file
,
modeDict
[
mode
]
)
except
OSError
:
except
OSError
:
if
filemode
in
modeDict
:
if
mode
==
'a'
:
filemode
=
modeDict
[
filemode
]
mode
=
key
=
'w'
continue
self
.
fp
=
io
.
open
(
file
,
modeDict
[
mode
])
else
:
raise
raise
break
else
:
else
:
self
.
_filePassed
=
1
self
.
_filePassed
=
1
self
.
fp
=
file
self
.
fp
=
file
self
.
filename
=
getattr
(
file
,
'name'
,
None
)
self
.
filename
=
getattr
(
file
,
'name'
,
None
)
self
.
_fileRefCnt
=
1
try
:
try
:
if
mode
==
'r'
:
if
key
==
'r'
:
self
.
_RealGetContents
()
self
.
_RealGetContents
()
elif
mode
==
'w'
:
elif
key
==
'w'
:
# set the modified flag so central directory gets written
# set the modified flag so central directory gets written
# even if no files are added to the archive
# even if no files are added to the archive
self
.
_didModify
=
True
self
.
_didModify
=
True
self
.
start_dir
=
0
elif
key
==
'a'
:
elif
mode
==
'a'
:
try
:
try
:
# See if file is a zip file
# See if file is a zip file
self
.
_RealGetContents
()
self
.
_RealGetContents
()
...
@@ -976,13 +952,13 @@ class ZipFile:
...
@@ -976,13 +952,13 @@ class ZipFile:
# set the modified flag so central directory gets written
# set the modified flag so central directory gets written
# even if no files are added to the archive
# even if no files are added to the archive
self
.
_didModify
=
True
self
.
_didModify
=
True
self
.
start_dir
=
self
.
fp
.
tell
()
else
:
else
:
raise
RuntimeError
(
'Mode must be "r", "w" or "a"'
)
raise
RuntimeError
(
'Mode must be "r", "w" or "a"'
)
except
:
except
:
fp
=
self
.
fp
fp
=
self
.
fp
self
.
fp
=
None
self
.
fp
=
None
self
.
_fpclose
(
fp
)
if
not
self
.
_filePassed
:
fp
.
close
()
raise
raise
def
__enter__
(
self
):
def
__enter__
(
self
):
...
@@ -1155,6 +1131,14 @@ class ZipFile:
...
@@ -1155,6 +1131,14 @@ class ZipFile:
raise
RuntimeError
(
raise
RuntimeError
(
"Attempt to read ZIP archive that was already closed"
)
"Attempt to read ZIP archive that was already closed"
)
# Only open a new file for instances where we were not
# given a file object in the constructor
if
self
.
_filePassed
:
zef_file
=
self
.
fp
else
:
zef_file
=
io
.
open
(
self
.
filename
,
'rb'
)
try
:
# Make sure we have an info object
# Make sure we have an info object
if
isinstance
(
name
,
ZipInfo
):
if
isinstance
(
name
,
ZipInfo
):
# 'name' is already an info object
# 'name' is already an info object
...
@@ -1162,10 +1146,8 @@ class ZipFile:
...
@@ -1162,10 +1146,8 @@ class ZipFile:
else
:
else
:
# Get info object for name
# Get info object for name
zinfo
=
self
.
getinfo
(
name
)
zinfo
=
self
.
getinfo
(
name
)
zef_file
.
seek
(
zinfo
.
header_offset
,
0
)
self
.
_fileRefCnt
+=
1
zef_file
=
_SharedFile
(
self
.
fp
,
zinfo
.
header_offset
,
self
.
_fpclose
)
try
:
# Skip the file header:
# Skip the file header:
fheader
=
zef_file
.
read
(
sizeFileHeader
)
fheader
=
zef_file
.
read
(
sizeFileHeader
)
if
len
(
fheader
)
!=
sizeFileHeader
:
if
len
(
fheader
)
!=
sizeFileHeader
:
...
@@ -1224,8 +1206,10 @@ class ZipFile:
...
@@ -1224,8 +1206,10 @@ class ZipFile:
if
h
[
11
]
!=
check_byte
:
if
h
[
11
]
!=
check_byte
:
raise
RuntimeError
(
"Bad password for file"
,
name
)
raise
RuntimeError
(
"Bad password for file"
,
name
)
return
ZipExtFile
(
zef_file
,
mode
,
zinfo
,
zd
,
True
)
return
ZipExtFile
(
zef_file
,
mode
,
zinfo
,
zd
,
close_fileobj
=
not
self
.
_filePassed
)
except
:
except
:
if
not
self
.
_filePassed
:
zef_file
.
close
()
zef_file
.
close
()
raise
raise
...
@@ -1360,7 +1344,6 @@ class ZipFile:
...
@@ -1360,7 +1344,6 @@ class ZipFile:
zinfo
.
file_size
=
st
.
st_size
zinfo
.
file_size
=
st
.
st_size
zinfo
.
flag_bits
=
0x00
zinfo
.
flag_bits
=
0x00
self
.
fp
.
seek
(
self
.
start_dir
,
0
)
zinfo
.
header_offset
=
self
.
fp
.
tell
()
# Start of header bytes
zinfo
.
header_offset
=
self
.
fp
.
tell
()
# Start of header bytes
if
zinfo
.
compress_type
==
ZIP_LZMA
:
if
zinfo
.
compress_type
==
ZIP_LZMA
:
# Compressed data includes an end-of-stream (EOS) marker
# Compressed data includes an end-of-stream (EOS) marker
...
@@ -1377,7 +1360,6 @@ class ZipFile:
...
@@ -1377,7 +1360,6 @@ class ZipFile:
self
.
filelist
.
append
(
zinfo
)
self
.
filelist
.
append
(
zinfo
)
self
.
NameToInfo
[
zinfo
.
filename
]
=
zinfo
self
.
NameToInfo
[
zinfo
.
filename
]
=
zinfo
self
.
fp
.
write
(
zinfo
.
FileHeader
(
False
))
self
.
fp
.
write
(
zinfo
.
FileHeader
(
False
))
self
.
start_dir
=
self
.
fp
.
tell
()
return
return
cmpr
=
_get_compressor
(
zinfo
.
compress_type
)
cmpr
=
_get_compressor
(
zinfo
.
compress_type
)
...
@@ -1416,10 +1398,10 @@ class ZipFile:
...
@@ -1416,10 +1398,10 @@ class ZipFile:
raise
RuntimeError
(
'Compressed size larger than uncompressed size'
)
raise
RuntimeError
(
'Compressed size larger than uncompressed size'
)
# Seek backwards and write file header (which will now include
# Seek backwards and write file header (which will now include
# correct CRC and file sizes)
# correct CRC and file sizes)
self
.
start_dir
=
self
.
fp
.
tell
()
# Preserve current position in file
position
=
self
.
fp
.
tell
()
# Preserve current position in file
self
.
fp
.
seek
(
zinfo
.
header_offset
,
0
)
self
.
fp
.
seek
(
zinfo
.
header_offset
,
0
)
self
.
fp
.
write
(
zinfo
.
FileHeader
(
zip64
))
self
.
fp
.
write
(
zinfo
.
FileHeader
(
zip64
))
self
.
fp
.
seek
(
self
.
start_dir
,
0
)
self
.
fp
.
seek
(
position
,
0
)
self
.
filelist
.
append
(
zinfo
)
self
.
filelist
.
append
(
zinfo
)
self
.
NameToInfo
[
zinfo
.
filename
]
=
zinfo
self
.
NameToInfo
[
zinfo
.
filename
]
=
zinfo
...
@@ -1448,7 +1430,6 @@ class ZipFile:
...
@@ -1448,7 +1430,6 @@ class ZipFile:
"Attempt to write to ZIP archive that was already closed"
)
"Attempt to write to ZIP archive that was already closed"
)
zinfo
.
file_size
=
len
(
data
)
# Uncompressed size
zinfo
.
file_size
=
len
(
data
)
# Uncompressed size
self
.
fp
.
seek
(
self
.
start_dir
,
0
)
zinfo
.
header_offset
=
self
.
fp
.
tell
()
# Start of header data
zinfo
.
header_offset
=
self
.
fp
.
tell
()
# Start of header data
if
compress_type
is
not
None
:
if
compress_type
is
not
None
:
zinfo
.
compress_type
=
compress_type
zinfo
.
compress_type
=
compress_type
...
@@ -1477,7 +1458,6 @@ class ZipFile:
...
@@ -1477,7 +1458,6 @@ class ZipFile:
self
.
fp
.
write
(
struct
.
pack
(
fmt
,
zinfo
.
CRC
,
zinfo
.
compress_size
,
self
.
fp
.
write
(
struct
.
pack
(
fmt
,
zinfo
.
CRC
,
zinfo
.
compress_size
,
zinfo
.
file_size
))
zinfo
.
file_size
))
self
.
fp
.
flush
()
self
.
fp
.
flush
()
self
.
start_dir
=
self
.
fp
.
tell
()
self
.
filelist
.
append
(
zinfo
)
self
.
filelist
.
append
(
zinfo
)
self
.
NameToInfo
[
zinfo
.
filename
]
=
zinfo
self
.
NameToInfo
[
zinfo
.
filename
]
=
zinfo
...
@@ -1493,7 +1473,7 @@ class ZipFile:
...
@@ -1493,7 +1473,7 @@ class ZipFile:
try
:
try
:
if
self
.
mode
in
(
"w"
,
"a"
)
and
self
.
_didModify
:
# write ending records
if
self
.
mode
in
(
"w"
,
"a"
)
and
self
.
_didModify
:
# write ending records
self
.
fp
.
seek
(
self
.
start_dir
,
0
)
pos1
=
self
.
fp
.
tell
(
)
for
zinfo
in
self
.
filelist
:
# write central directory
for
zinfo
in
self
.
filelist
:
# write central directory
dt
=
zinfo
.
date_time
dt
=
zinfo
.
date_time
dosdate
=
(
dt
[
0
]
-
1980
)
<<
9
|
dt
[
1
]
<<
5
|
dt
[
2
]
dosdate
=
(
dt
[
0
]
-
1980
)
<<
9
|
dt
[
1
]
<<
5
|
dt
[
2
]
...
@@ -1559,8 +1539,8 @@ class ZipFile:
...
@@ -1559,8 +1539,8 @@ class ZipFile:
pos2
=
self
.
fp
.
tell
()
pos2
=
self
.
fp
.
tell
()
# Write end-of-zip-archive record
# Write end-of-zip-archive record
centDirCount
=
len
(
self
.
filelist
)
centDirCount
=
len
(
self
.
filelist
)
centDirSize
=
pos2
-
self
.
start_dir
centDirSize
=
pos2
-
pos1
centDirOffset
=
self
.
start_dir
centDirOffset
=
pos1
requires_zip64
=
None
requires_zip64
=
None
if
centDirCount
>
ZIP_FILECOUNT_LIMIT
:
if
centDirCount
>
ZIP_FILECOUNT_LIMIT
:
requires_zip64
=
"Files count"
requires_zip64
=
"Files count"
...
@@ -1596,12 +1576,7 @@ class ZipFile:
...
@@ -1596,12 +1576,7 @@ class ZipFile:
finally
:
finally
:
fp
=
self
.
fp
fp
=
self
.
fp
self
.
fp
=
None
self
.
fp
=
None
self
.
_fpclose
(
fp
)
if
not
self
.
_filePassed
:
def
_fpclose
(
self
,
fp
):
assert
self
.
_fileRefCnt
>
0
self
.
_fileRefCnt
-=
1
if
not
self
.
_fileRefCnt
and
not
self
.
_filePassed
:
fp
.
close
()
fp
.
close
()
...
...
Misc/NEWS
Dosyayı görüntüle @
b76bcc4f
...
@@ -132,11 +132,6 @@ Library
...
@@ -132,11 +132,6 @@ Library
- Issue #16043: Add a default limit for the amount of data xmlrpclib.gzip_decode
- Issue #16043: Add a default limit for the amount of data xmlrpclib.gzip_decode
will return. This resolves CVE-2013-1753.
will return. This resolves CVE-2013-1753.
- Issue #14099: ZipFile.open() no longer reopen the underlying file. Objects
returned by ZipFile.open() can now operate independently of the ZipFile even
if the ZipFile was created by passing in a file-like object as the first
argument to the constructor.
- Issue #22966: Fix __pycache__ pyc file name clobber when pyc_compile is
- Issue #22966: Fix __pycache__ pyc file name clobber when pyc_compile is
asked to compile a source file containing multiple dots in the source file
asked to compile a source file containing multiple dots in the source file
name.
name.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment