GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Issue #25624: ZipFile now always writes a ZIP_STORED header for direc… · python/cpython@5323ed3

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Lib
- test
  - test_shutil.py
- zipfile.py
Misc
- ACKS
- NEWS

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Lib/test/test_shutil.py‎`

Copy file name to clipboardExpand all lines: Lib/test/test_shutil.py

+23Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -511,6 +511,29 @@ def test_zipfile_vs_zip(self):`
`511`	`511`	`names2 = zf.namelist()`
`512`	`512`	`self.assertEqual(sorted(names), sorted(names2))`
`513`	`513`
	`514`	`+ @unittest.skipUnless(zlib, "Requires zlib")`
	`515`	`+ @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')`
	`516`	`+ @unittest.skipUnless(find_executable('unzip'),`
	`517`	`+ 'Need the unzip command to run')`
	`518`	`+ def test_unzip_zipfile(self):`
	`519`	`+ root_dir, base_dir = self._create_files()`
	`520`	`+ base_name = os.path.join(self.mkdtemp(), 'archive')`
	`521`	`+ archive = make_archive(base_name, 'zip', root_dir, base_dir)`
	`522`	`+`
	`523`	`+ # check if ZIP file was created`
	`524`	`+ self.assertEqual(archive, base_name + '.zip')`
	`525`	`+ self.assertTrue(os.path.isfile(archive))`
	`526`	`+`
	`527`	+ # now check the ZIP file using `unzip -t`
	`528`	`+ zip_cmd = ['unzip', '-t', archive]`
	`529`	`+ with support.change_cwd(root_dir):`
	`530`	`+ try:`
	`531`	`+ subprocess.check_output(zip_cmd, stderr=subprocess.STDOUT)`
	`532`	`+ except subprocess.CalledProcessError as exc:`
	`533`	`+ details = exc.output`
	`534`	`+ msg = "{}\n\nUnzip Output\n{}"`
	`535`	`+ self.fail(msg.format(exc, details))`
	`536`	`+`
`514`	`537`	`def test_make_archive(self):`
`515`	`538`	`tmpdir = self.mkdtemp()`
`516`	`539`	`base_name = os.path.join(tmpdir, 'archive')`

Collapse file

`‎Lib/zipfile.py‎`

Copy file name to clipboardExpand all lines: Lib/zipfile.py

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1134,7 +1134,9 @@ def write(self, filename, arcname=None, compress_type=None):`
`1134`	`1134`	`arcname += '/'`
`1135`	`1135`	`zinfo = ZipInfo(arcname, date_time)`
`1136`	`1136`	`zinfo.external_attr = (st[0] & 0xFFFF) << 16L # Unix attributes`
`1137`		`- if compress_type is None:`
	`1137`	`+ if isdir:`
	`1138`	`+ zinfo.compress_type = ZIP_STORED`
	`1139`	`+ elif compress_type is None:`
`1138`	`1140`	`zinfo.compress_type = self.compression`
`1139`	`1141`	`else:`
`1140`	`1142`	`zinfo.compress_type = compress_type`

Collapse file

`‎Misc/ACKS‎`

Copy file name to clipboardExpand all lines: Misc/ACKS

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1443,6 +1443,7 @@ Richard Walker`
`1443`	`1443`	`Larry Wall`
`1444`	`1444`	`Kevin Walzer`
`1445`	`1445`	`Rodrigo Steinmuller Wanderley`
	`1446`	`+Dingyuan Wang`
`1446`	`1447`	`Ke Wang`
`1447`	`1448`	`Greg Ward`
`1448`	`1449`	`Tom Wardill`

Collapse file

`‎Misc/NEWS‎`

Copy file name to clipboardExpand all lines: Misc/NEWS

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ Core and Builtins`
`13`	`13`	`Library`
`14`	`14`	`-------`
`15`	`15`
	`16`	`+- Issue #25624: ZipFile now always writes a ZIP_STORED header for directory`
	`17`	`+ entries. Patch by Dingyuan Wang.`
	`18`	`+`
`16`	`19`
`17`	`20`	`What's New in Python 2.7.11 release candidate 1?`
`18`	`21`	`================================================`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — 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.