gh-99203: shutil.make_archive(): restore select CPython <= 3.10.5 b…

…ehavior Restore following CPython <= 3.10.5 behavior of `shutil.make_archive()` that went away as part of gh-93160: Do not create an empty archive if `root_dir` is not a directory, and, in that case, raise `FileNotFoundError` or `NotADirectoryError` regardless of `format` choice. Beyond the brought-back behavior, the function may now also raise these exceptions in `dry_run` mode.
python · serhiy-storchaka · Aug 16, 2023 · Nov 26, 2022 · Nov 30, 2022 · Jan 30, 2023
commit ec8b8d1132e3d7bf9b7e2378d5b70d2ae6dbee49
diff --git a/Lib/shutil.py b/Lib/shutil.py
@@ -1104,6 +1104,10 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     supports_root_dir = getattr(func, 'supports_root_dir', False)
     save_cwd = None
     if root_dir is not None:
+        stmd = os.stat(root_dir).st_mode
+        if not stat.S_ISDIR(stmd):
+            raise NotADirectoryError(root_dir)
+
         if supports_root_dir:
             # Support path-like base_name here for backwards-compatibility.
             base_name = os.fspath(base_name)

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
@@ -1665,6 +1665,48 @@ def test_register_archive_format(self):
         formats = [name for name, params in get_archive_formats()]
         self.assertNotIn('xxx', formats)
 
+    def _unlink_existing_file(self, path):
+        try:
+            os.unlink(path)
+        except FileNotFoundError:
+            print(f"File {path} not found")
+            pass
+
+    def test_make_tarfile_rootdir_nodir(self):
+        # GH-99203
+        self.addCleanup(self._unlink_existing_file, f'{TESTFN}.tar')
+        for dry_run in (0, True):
+            tmp_fd, tmp_file = tempfile.mkstemp(dir=self.mkdtemp())
+            os.close(tmp_fd)
+            with self.assertRaises(NotADirectoryError):
+                make_archive(TESTFN, 'tar', tmp_file, dry_run=dry_run)
+            self.assertFalse(os.path.exists(f'{TESTFN}.tar'))
+
+            tmp_fd, tmp_file = tempfile.mkstemp(dir=self.mkdtemp())
+            os.close(tmp_fd)
+            os.unlink(tmp_file)
+            with self.assertRaises(FileNotFoundError):
+                make_archive(TESTFN, 'tar', tmp_file, dry_run=dry_run)
+            self.assertFalse(os.path.exists(f'{TESTFN}.tar'))
+
+    @support.requires_zlib()
+    def test_make_zipfile_rootdir_nodir(self):
+        # GH-99203
+        self.addCleanup(self._unlink_existing_file, f'{TESTFN}.zip')
+        for dry_run in (0, True):
+            tmp_fd, tmp_file = tempfile.mkstemp(dir=self.mkdtemp())
+            os.close(tmp_fd)
+            with self.assertRaises(NotADirectoryError):
+                make_archive(TESTFN, 'zip', tmp_file, dry_run=dry_run)
+            self.assertFalse(os.path.exists(f'{TESTFN}.zip'))
+
+            tmp_fd, tmp_file = tempfile.mkstemp(dir=self.mkdtemp())
+            os.close(tmp_fd)
+            os.unlink(tmp_file)
+            with self.assertRaises(FileNotFoundError):
+                make_archive(TESTFN, 'zip', tmp_file, dry_run=dry_run)
+            self.assertFalse(os.path.exists(f'{TESTFN}.zip'))
+
     ### shutil.unpack_archive
 
     def check_unpack_archive(self, format):

diff --git a/Misc/NEWS.d/next/Library/2022-11-26-22-05-22.gh-issue-99203.j0DUae.rst b/Misc/NEWS.d/next/Library/2022-11-26-22-05-22.gh-issue-99203.j0DUae.rst
@@ -0,0 +1,5 @@
+Restore following CPython <= 3.10.5 behavior of :func:`shutil.make_archive`:
+do not create an empty archive if ``root_dir`` is not a directory, and, in that
+case, raise :class:`FileNotFoundError` or :class:`NotADirectoryError`
+regardless of ``format`` choice. Beyond the brought-back behavior, the function
+may now also raise these exceptions in ``dry_run`` mode.