Commit 62110c76 authored by Antoine Pitrou's avatar Antoine Pitrou

Merge

parents 314a16b0 468ff4c3
...@@ -245,8 +245,8 @@ def calc_chksums(buf): ...@@ -245,8 +245,8 @@ def calc_chksums(buf):
the high bit set. So we calculate two checksums, unsigned and the high bit set. So we calculate two checksums, unsigned and
signed. signed.
""" """
unsigned_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("148b", buf[:148]) + struct.unpack("356b", buf[156:512])) signed_chksum = 256 + sum(struct.unpack_from("148b8x356b", buf))
return unsigned_chksum, signed_chksum return unsigned_chksum, signed_chksum
def copyfileobj(src, dst, length=None): def copyfileobj(src, dst, length=None):
......
...@@ -776,6 +776,7 @@ Gaël Pasgrimaud ...@@ -776,6 +776,7 @@ Gaël Pasgrimaud
Joe Peterson Joe Peterson
Randy Pausch Randy Pausch
Samuele Pedroni Samuele Pedroni
Justin Peel
Marcel van der Peijl Marcel van der Peijl
Berker Peksag Berker Peksag
Steven Pemberton Steven Pemberton
......
...@@ -38,6 +38,9 @@ Core and Builtins ...@@ -38,6 +38,9 @@ Core and Builtins
Library 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 - Issue #14780: urllib.request.urlopen() now has a ``cadefault`` argument
to use the default certificate store. Initial patch by James Oakley. to use the default certificate store. Initial patch by James Oakley.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment