mirror of https://github.com/python/cpython
Merge
This commit is contained in:
commit
62110c769f
|
@ -245,8 +245,8 @@ def calc_chksums(buf):
|
|||
the high bit set. So we calculate two checksums, unsigned and
|
||||
signed.
|
||||
"""
|
||||
unsigned_chksum = 256 + sum(struct.unpack("148B", buf[:148]) + struct.unpack("356B", buf[156:512]))
|
||||
signed_chksum = 256 + sum(struct.unpack("148b", buf[:148]) + struct.unpack("356b", buf[156:512]))
|
||||
unsigned_chksum = 256 + sum(struct.unpack_from("148B8x356B", buf))
|
||||
signed_chksum = 256 + sum(struct.unpack_from("148b8x356b", buf))
|
||||
return unsigned_chksum, signed_chksum
|
||||
|
||||
def copyfileobj(src, dst, length=None):
|
||||
|
|
|
@ -776,6 +776,7 @@ Gaël Pasgrimaud
|
|||
Joe Peterson
|
||||
Randy Pausch
|
||||
Samuele Pedroni
|
||||
Justin Peel
|
||||
Marcel van der Peijl
|
||||
Berker Peksag
|
||||
Steven Pemberton
|
||||
|
|
|
@ -38,6 +38,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #13031: Small speed-up for tarfile when unzipping tarfiles.
|
||||
Patch by Justin Peel.
|
||||
|
||||
- Issue #14780: urllib.request.urlopen() now has a ``cadefault`` argument
|
||||
to use the default certificate store. Initial patch by James Oakley.
|
||||
|
||||
|
|
Loading…
Reference in New Issue