diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-01-07 01:45:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 01:45:37 (GMT) |
| commit | db6f297d448ce46e58a5b90239a4779553333198 (patch) | |
| tree | 5815dc2c1e9fb9c7ca5128d0228d11d585044f44 | |
| parent | 4d5328cbebc441ed2539ad3b2ea30a01eb059ef7 (diff) | |
| download | cpython-db6f297d448ce46e58a5b90239a4779553333198.zip cpython-db6f297d448ce46e58a5b90239a4779553333198.tar.gz cpython-db6f297d448ce46e58a5b90239a4779553333198.tar.bz2 | |
[3.12] gh-112795: Allow `/` folder in a zipfile (GH-112932) (#113789)
gh-112795: Allow `/` folder in a zipfile (GH-112932)
Allow extraction (no-op) of a "/" folder in a zipfile, they are commonly added by some archive creation tools.
(cherry picked from commit 541c5dbb81c784afd587406be2cc82645979a107)
Co-authored-by: AN Long <aisk@users.noreply.github.com>
Co-authored-by: Erlend E. Aasland <erlend@python.org>
Co-authored-by: Gregory P. Smith <greg@krypto.org>
| -rw-r--r-- | Lib/test/test_zipfile/_path/test_path.py | 12 | ||||
| -rw-r--r-- | Lib/zipfile/__init__.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2024-01-07-00-56-41.gh-issue-112932.OfhUu7.rst | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Lib/test/test_zipfile/_path/test_path.py b/Lib/test/test_zipfile/_path/test_path.py index c66cb3c..171ab6f 100644 --- a/Lib/test/test_zipfile/_path/test_path.py +++ b/Lib/test/test_zipfile/_path/test_path.py @@ -577,3 +577,15 @@ class TestPath(unittest.TestCase): zipfile.Path(alpharep) with self.assertRaises(KeyError): alpharep.getinfo('does-not-exist') + + def test_root_folder_in_zipfile(self): + """ + gh-112795: Some tools or self constructed codes will add '/' folder to + the zip file, this is a strange behavior, but we should support it. + """ + in_memory_file = io.BytesIO() + zf = zipfile.ZipFile(in_memory_file, "w") + zf.mkdir('/') + zf.writestr('./a.txt', 'aaa') + tmpdir = pathlib.Path(self.fixtures.enter_context(temp_dir())) + zf.extractall(tmpdir) diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py index 420d2f8..e289c6c 100644 --- a/Lib/zipfile/__init__.py +++ b/Lib/zipfile/__init__.py @@ -1758,7 +1758,7 @@ class ZipFile: # filter illegal characters on Windows arcname = self._sanitize_windows_name(arcname, os.path.sep) - if not arcname: + if not arcname and not member.is_dir(): raise ValueError("Empty filename.") targetpath = os.path.join(targetpath, arcname) diff --git a/Misc/NEWS.d/next/Library/2024-01-07-00-56-41.gh-issue-112932.OfhUu7.rst b/Misc/NEWS.d/next/Library/2024-01-07-00-56-41.gh-issue-112932.OfhUu7.rst new file mode 100644 index 0000000..c61525c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-01-07-00-56-41.gh-issue-112932.OfhUu7.rst @@ -0,0 +1,3 @@ +Restore the ability for :mod:`zipfile` to ``extractall`` from zip files with +a "/" directory entry in them as is commonly added to zips by some wiki or +bug tracker data exporters. |