Skip to content

Commit e6abc55

Browse files
committed
Remove _strip_extra and use _Extra.strip directly.
1 parent 796f1dd commit e6abc55

File tree

2 files changed

+24
-27
lines changed

2 files changed

+24
-27
lines changed

Lib/test/test_zipfile/test_core.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3023,53 +3023,53 @@ def test_no_data(self):
30233023
b = s.pack(2, 0)
30243024
c = s.pack(3, 0)
30253025

3026-
self.assertEqual(b'', zipfile._strip_extra(a, (self.ZIP64_EXTRA,)))
3027-
self.assertEqual(b, zipfile._strip_extra(b, (self.ZIP64_EXTRA,)))
3026+
self.assertEqual(b'', zipfile._Extra.strip(a, (self.ZIP64_EXTRA,)))
3027+
self.assertEqual(b, zipfile._Extra.strip(b, (self.ZIP64_EXTRA,)))
30283028
self.assertEqual(
3029-
b+b"z", zipfile._strip_extra(b+b"z", (self.ZIP64_EXTRA,)))
3029+
b+b"z", zipfile._Extra.strip(b+b"z", (self.ZIP64_EXTRA,)))
30303030

3031-
self.assertEqual(b+c, zipfile._strip_extra(a+b+c, (self.ZIP64_EXTRA,)))
3032-
self.assertEqual(b+c, zipfile._strip_extra(b+a+c, (self.ZIP64_EXTRA,)))
3033-
self.assertEqual(b+c, zipfile._strip_extra(b+c+a, (self.ZIP64_EXTRA,)))
3031+
self.assertEqual(b+c, zipfile._Extra.strip(a+b+c, (self.ZIP64_EXTRA,)))
3032+
self.assertEqual(b+c, zipfile._Extra.strip(b+a+c, (self.ZIP64_EXTRA,)))
3033+
self.assertEqual(b+c, zipfile._Extra.strip(b+c+a, (self.ZIP64_EXTRA,)))
30343034

30353035
def test_with_data(self):
30363036
s = struct.Struct("<HH")
30373037
a = s.pack(self.ZIP64_EXTRA, 1) + b"a"
30383038
b = s.pack(2, 2) + b"bb"
30393039
c = s.pack(3, 3) + b"ccc"
30403040

3041-
self.assertEqual(b"", zipfile._strip_extra(a, (self.ZIP64_EXTRA,)))
3042-
self.assertEqual(b, zipfile._strip_extra(b, (self.ZIP64_EXTRA,)))
3041+
self.assertEqual(b"", zipfile._Extra.strip(a, (self.ZIP64_EXTRA,)))
3042+
self.assertEqual(b, zipfile._Extra.strip(b, (self.ZIP64_EXTRA,)))
30433043
self.assertEqual(
3044-
b+b"z", zipfile._strip_extra(b+b"z", (self.ZIP64_EXTRA,)))
3044+
b+b"z", zipfile._Extra.strip(b+b"z", (self.ZIP64_EXTRA,)))
30453045

3046-
self.assertEqual(b+c, zipfile._strip_extra(a+b+c, (self.ZIP64_EXTRA,)))
3047-
self.assertEqual(b+c, zipfile._strip_extra(b+a+c, (self.ZIP64_EXTRA,)))
3048-
self.assertEqual(b+c, zipfile._strip_extra(b+c+a, (self.ZIP64_EXTRA,)))
3046+
self.assertEqual(b+c, zipfile._Extra.strip(a+b+c, (self.ZIP64_EXTRA,)))
3047+
self.assertEqual(b+c, zipfile._Extra.strip(b+a+c, (self.ZIP64_EXTRA,)))
3048+
self.assertEqual(b+c, zipfile._Extra.strip(b+c+a, (self.ZIP64_EXTRA,)))
30493049

30503050
def test_multiples(self):
30513051
s = struct.Struct("<HH")
30523052
a = s.pack(self.ZIP64_EXTRA, 1) + b"a"
30533053
b = s.pack(2, 2) + b"bb"
30543054

3055-
self.assertEqual(b"", zipfile._strip_extra(a+a, (self.ZIP64_EXTRA,)))
3056-
self.assertEqual(b"", zipfile._strip_extra(a+a+a, (self.ZIP64_EXTRA,)))
3055+
self.assertEqual(b"", zipfile._Extra.strip(a+a, (self.ZIP64_EXTRA,)))
3056+
self.assertEqual(b"", zipfile._Extra.strip(a+a+a, (self.ZIP64_EXTRA,)))
30573057
self.assertEqual(
3058-
b"z", zipfile._strip_extra(a+a+b"z", (self.ZIP64_EXTRA,)))
3058+
b"z", zipfile._Extra.strip(a+a+b"z", (self.ZIP64_EXTRA,)))
30593059
self.assertEqual(
3060-
b+b"z", zipfile._strip_extra(a+a+b+b"z", (self.ZIP64_EXTRA,)))
3060+
b+b"z", zipfile._Extra.strip(a+a+b+b"z", (self.ZIP64_EXTRA,)))
30613061

3062-
self.assertEqual(b, zipfile._strip_extra(a+a+b, (self.ZIP64_EXTRA,)))
3063-
self.assertEqual(b, zipfile._strip_extra(a+b+a, (self.ZIP64_EXTRA,)))
3064-
self.assertEqual(b, zipfile._strip_extra(b+a+a, (self.ZIP64_EXTRA,)))
3062+
self.assertEqual(b, zipfile._Extra.strip(a+a+b, (self.ZIP64_EXTRA,)))
3063+
self.assertEqual(b, zipfile._Extra.strip(a+b+a, (self.ZIP64_EXTRA,)))
3064+
self.assertEqual(b, zipfile._Extra.strip(b+a+a, (self.ZIP64_EXTRA,)))
30653065

30663066
def test_too_short(self):
3067-
self.assertEqual(b"", zipfile._strip_extra(b"", (self.ZIP64_EXTRA,)))
3068-
self.assertEqual(b"z", zipfile._strip_extra(b"z", (self.ZIP64_EXTRA,)))
3067+
self.assertEqual(b"", zipfile._Extra.strip(b"", (self.ZIP64_EXTRA,)))
3068+
self.assertEqual(b"z", zipfile._Extra.strip(b"z", (self.ZIP64_EXTRA,)))
30693069
self.assertEqual(
3070-
b"zz", zipfile._strip_extra(b"zz", (self.ZIP64_EXTRA,)))
3070+
b"zz", zipfile._Extra.strip(b"zz", (self.ZIP64_EXTRA,)))
30713071
self.assertEqual(
3072-
b"zzz", zipfile._strip_extra(b"zzz", (self.ZIP64_EXTRA,)))
3072+
b"zzz", zipfile._Extra.strip(b"zzz", (self.ZIP64_EXTRA,)))
30733073

30743074

30753075
if __name__ == "__main__":

Lib/zipfile/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ def strip(cls, data, xids):
223223
)
224224

225225

226-
_strip_extra = _Extra.strip
227-
228-
229226
def _check_zipfile(fp):
230227
try:
231228
if _EndRecData(fp):
@@ -1950,7 +1947,7 @@ def _write_end_record(self):
19501947
min_version = 0
19511948
if extra:
19521949
# Append a ZIP64 field to the extra's
1953-
extra_data = _strip_extra(extra_data, (1,))
1950+
extra_data = _Extra.strip(extra_data, (1,))
19541951
extra_data = struct.pack(
19551952
'<HH' + 'Q'*len(extra),
19561953
1, 8*len(extra), *extra) + extra_data

0 commit comments

Comments
 (0)