Fix error in NEWS entry

Author: berland

Lib/shutil.py

@@ -526,10 +526,13 @@ def _copytree(entries, src, dst, symlinks, ignore, copy_function,
             elif srcentry.is_dir():
                 # Will raise shutil.Error containing multiple exceptions gathered
                 # from recursion
+                print(f"****copytree on {srcobj} {dstname}")
                 copytree(srcobj, dstname, symlinks, ignore, copy_function,
                          ignore_dangling_symlinks, dirs_exist_ok)
             else:
                 # Can raise SpecialFileError or SameFileError
+                print("*****************************")
+                print(f"****copy_function on {srcobj} {dstname}")
                 copy_function(srcobj, dstname)
         except SameFileError as err:
             errors.append((srcname, dstname, str(err)))

Lib/test/test_shutil.py

@@ -996,7 +996,7 @@ def custom_cpfun(a, b):
     @os_helper.skip_unless_symlink
     @unittest.skipIf(sys.platform == "vxworks",
                     "fifo requires special path on VxWorks")
-    def test_copytree_named_pipe(self):
+    def test_copytree_directory_containing_named_pipe(self):
         os.mkdir(TESTFN)
         try:
             subdir = os.path.join(TESTFN, "subdir")
@@ -1006,6 +1006,27 @@ def test_copytree_named_pipe(self):
                 os.mkfifo(pipe)
             except PermissionError as e:
                 self.skipTest('os.mkfifo(): %s' % e)
+            try:
+                shutil.copytree(subdir, TESTFN2)
+            except shutil.Error as e:
+                errors = e.args[0]
+                self.assertEqual(len(errors), 1)
+                src, dst, error_msg = errors[0]
+                self.assertEqual("`%s` is a named pipe" % pipe, error_msg)
+            else:
+                self.fail("shutil.Error should have been raised")
+        finally:
+            shutil.rmtree(TESTFN, ignore_errors=True)
+            shutil.rmtree(TESTFN2, ignore_errors=True)
+
+    @unittest.skipUnless(hasattr(os, "mkfifo"), 'requires os.mkfifo()')
+    @os_helper.skip_unless_symlink
+    @unittest.skipIf(sys.platform == "vxworks",
+                    "fifo requires special path on VxWorks")
+    def test_copytree_a_named_pipe(self):
+        os.mkdir(TESTFN)
+        try:
+            os.mkfifo(TESTFN2)
             try:
                 shutil.copytree(TESTFN, TESTFN2)
             except shutil.Error as e:

Misc/NEWS.d/next/Library/2024-12-28-16-25-42.gh-issue-102931.55o5kb.rst

@@ -1,2 +1,2 @@
-Make exception from :func:`shutil.copy_directory` readable when a
+Make exception from :func:`shutil.copytree` readable when a
 :exc:`shutil.SameFileError` is raised.