GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -3010,5 +3010,67 @@ def test_cli_with_metadata_encoding_extract(self):
		self.assertIn(name, listing)


		class StripExtraTests(unittest.TestCase):
		# Note: all of the "z" characters are technically invalid, but up
		# to 3 bytes at the end of the extra will be passed through as they
		# are too short to encode a valid extra.

		ZIP64_EXTRA = 1

		def test_no_data(self):
		s = struct.Struct("<HH")
		a = s.pack(self.ZIP64_EXTRA, 0)
		b = s.pack(2, 0)
		c = s.pack(3, 0)

		self.assertEqual(b'', zipfile._strip_extra(a, (self.ZIP64_EXTRA,)))
		self.assertEqual(b, zipfile._strip_extra(b, (self.ZIP64_EXTRA,)))
		self.assertEqual(
		b+b"z", zipfile._strip_extra(b+b"z", (self.ZIP64_EXTRA,)))

		self.assertEqual(b+c, zipfile._strip_extra(a+b+c, (self.ZIP64_EXTRA,)))
		self.assertEqual(b+c, zipfile._strip_extra(b+a+c, (self.ZIP64_EXTRA,)))
		self.assertEqual(b+c, zipfile._strip_extra(b+c+a, (self.ZIP64_EXTRA,)))

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

		self.assertEqual(b"", zipfile._strip_extra(a, (self.ZIP64_EXTRA,)))
		self.assertEqual(b, zipfile._strip_extra(b, (self.ZIP64_EXTRA,)))
		self.assertEqual(
		b+b"z", zipfile._strip_extra(b+b"z", (self.ZIP64_EXTRA,)))

		self.assertEqual(b+c, zipfile._strip_extra(a+b+c, (self.ZIP64_EXTRA,)))
		self.assertEqual(b+c, zipfile._strip_extra(b+a+c, (self.ZIP64_EXTRA,)))
		self.assertEqual(b+c, zipfile._strip_extra(b+c+a, (self.ZIP64_EXTRA,)))

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

		self.assertEqual(b"", zipfile._strip_extra(a+a, (self.ZIP64_EXTRA,)))
		self.assertEqual(b"", zipfile._strip_extra(a+a+a, (self.ZIP64_EXTRA,)))
		self.assertEqual(
		b"z", zipfile._strip_extra(a+a+b"z", (self.ZIP64_EXTRA,)))
		self.assertEqual(
		b+b"z", zipfile._strip_extra(a+a+b+b"z", (self.ZIP64_EXTRA,)))

		self.assertEqual(b, zipfile._strip_extra(a+a+b, (self.ZIP64_EXTRA,)))
		self.assertEqual(b, zipfile._strip_extra(a+b+a, (self.ZIP64_EXTRA,)))
		self.assertEqual(b, zipfile._strip_extra(b+a+a, (self.ZIP64_EXTRA,)))

		def test_too_short(self):
		self.assertEqual(b"", zipfile._strip_extra(b"", (self.ZIP64_EXTRA,)))
		self.assertEqual(b"z", zipfile._strip_extra(b"z", (self.ZIP64_EXTRA,)))
		self.assertEqual(
		b"zz", zipfile._strip_extra(b"zz", (self.ZIP64_EXTRA,)))
		self.assertEqual(
		b"zzz", zipfile._strip_extra(b"zzz", (self.ZIP64_EXTRA,)))


		if __name__ == "__main__":
		unittest.main()

2 changes: 2 additions & 0 deletions 2 Lib/zipfile/__init__.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -207,6 +207,8 @@ def _strip_extra(extra, xids):
		i = j
		if not modified:
		return extra
		if start != len(extra):
		buffer.append(extra[start:])
		return b''.join(buffer)

		def _check_zipfile(fp):
Expand Down

2 changes: 2 additions & 0 deletions 2 Misc/NEWS.d/next/Library/2022-09-05-12-17-34.gh-issue-88233.gff9qJ.rst

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Correctly preserve "extra" fields in ``zipfile`` regardless of their
		ordering relative to a zip64 "extra."

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.