diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-05-17 19:04:49 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-05-17 19:04:49 (GMT) |
commit | 62110c769f9681c7a747d3e136759937222edc7d (patch) | |
tree | 32ae53fd41ccf56970967eb7ba66b9a125bb8b8c | |
parent | 314a16b0ececffbe33bbca1242dd53022b018f4a (diff) | |
parent | 468ff4c3ed07b815898a749eca14e9ae1ea76893 (diff) | |
download | cpython-62110c769f9681c7a747d3e136759937222edc7d.zip cpython-62110c769f9681c7a747d3e136759937222edc7d.tar.gz cpython-62110c769f9681c7a747d3e136759937222edc7d.tar.bz2 |
Merge
-rw-r--r-- | Lib/tarfile.py | 4 | ||||
-rw-r--r-- | Misc/ACKS | 1 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 9d38421..8549677 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -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. |