From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 20 Jul 2022 16:24:33 +0000 (-0700)
Subject: gh-94844: Add pathlib support to shutil archive management (GH-94846)
X-Git-Tag: v3.10.6~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbe3ad51ed63e2e5afc408f0bbeb8bb0e9fb7f44;p=thirdparty%2FPython%2Fcpython.git

gh-94844: Add pathlib support to shutil archive management (GH-94846)


Co-authored-by: Barney Gale <barney.gale@gmail.com>
(cherry picked from commit ed4441567ec480d1e4d8f982bd1f7347e4d03c42)

Co-authored-by: Oleg Iarygin <oleg@arhadthedev.net>
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 90dcaa7d7682..0d278801b8a6 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1108,6 +1108,8 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     save_cwd = None
     if root_dir is not None:
         if support_root_dir:
+            # Support path-like base_name here for backwards-compatibility.
+            base_name = os.fspath(base_name)
             kwargs['root_dir'] = root_dir
         else:
             save_cwd = os.getcwd()