From bc39e2564ef72fc5b3f215db150ce29afca3ac2d Mon Sep 17 00:00:00 2001 From: mbarkhau Date: Sun, 19 Jan 2020 20:49:15 +0000 Subject: [PATCH 1/3] Add versionchanged 3.9 notice to shutil.copytree see https://bugs.python.org/issue39390 --- Doc/library/shutil.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 59390d0e907eb9..9a0d896c70a180 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -271,6 +271,12 @@ Directory and files operations .. versionadded:: 3.8 The *dirs_exist_ok* parameter. + + .. versionchanged:: 3.8 + The types of the arguments to the *ignore* callable have changed. The + first argument (the directory being visited) is a func:`os.DirEntry` or + a func:`pathlib.Path`; Previously it was a string. The second argument + is a set of strings; previously it was a list of strings. .. function:: rmtree(path, ignore_errors=False, onerror=None) From cb2b1823887c4bdcba6d4a36f0cf33cbf21d3ed0 Mon Sep 17 00:00:00 2001 From: mbarkhau Date: Sun, 19 Jan 2020 21:07:30 +0000 Subject: [PATCH 2/3] GH-18069: Update doc for shutil.copytree ignore arg --- Doc/library/shutil.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 9a0d896c70a180..7dd32cff781f23 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -274,9 +274,10 @@ Directory and files operations .. versionchanged:: 3.8 The types of the arguments to the *ignore* callable have changed. The - first argument (the directory being visited) is a func:`os.DirEntry` or - a func:`pathlib.Path`; Previously it was a string. The second argument - is a set of strings; previously it was a list of strings. + first argument (the directory being visited) can be a string, a + func:`os.DirEntry` or a func:`pathlib.Path`; Previously it was a string. + The second argument is a set of strings; previously it was a list of + strings. .. function:: rmtree(path, ignore_errors=False, onerror=None) From 7a181c7a03b643550571cc9435cd64733bb9d43e Mon Sep 17 00:00:00 2001 From: mbarkhau Date: Sun, 19 Jan 2020 21:18:01 +0000 Subject: [PATCH 3/3] fix trailing whitespace --- Doc/library/shutil.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 7dd32cff781f23..525318f6ceff38 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -271,7 +271,7 @@ Directory and files operations .. versionadded:: 3.8 The *dirs_exist_ok* parameter. - + .. versionchanged:: 3.8 The types of the arguments to the *ignore* callable have changed. The first argument (the directory being visited) can be a string, a