Revert "bpo-38811: Check for presence of os.link method in pathlib. (GH-17170)" ...

This reverts commit 111772fc27cfe388bc060f019d68a3e33481ec65.

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 5142ff68d100d49a62bbd770af22b8d1b49b81d3..d70fde0ea3b452ce0aa8b41c3bfe8fbc95a32997 100644 (file)
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -418,12 +418,7 @@ class _NormalAccessor(_Accessor):
 
     unlink = os.unlink
 
-    if hasattr(os, "link"):
-        link_to = os.link
-    else:
-        @staticmethod
-        def link_to(self, target):
-            raise NotImplementedError("os.link() not available on this system")
+    link_to = os.link
 
     rmdir = os.rmdir
 
@@ -435,7 +430,6 @@ class _NormalAccessor(_Accessor):
         if supports_symlinks:
             symlink = os.symlink
         else:
-            @staticmethod
             def symlink(a, b, target_is_directory):
                 raise NotImplementedError("symlink() not available on this system")
     else:

diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index d05b956be39f36c96096f6744424491a0a37eebd..058a201aebc1d81534f122224c854a53f0b44d0d 100644 (file)
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1759,7 +1759,6 @@ class _BasePathTest(object):
         self.assertFileNotFound(p.stat)
         self.assertFileNotFound(p.unlink)
 
-    @unittest.skipUnless(hasattr(os, "link"), "os.link() is not present")
     def test_link_to(self):
         P = self.cls(BASE)
         p = P / 'fileA'
@@ -1779,15 +1778,6 @@ class _BasePathTest(object):
         self.assertEqual(os.stat(r).st_size, size)
         self.assertTrue(q.stat)
 
-    @unittest.skipIf(hasattr(os, "link"), "os.link() is present")
-    def test_link_to_not_implemented(self):
-        P = self.cls(BASE)
-        p = P / 'fileA'
-        # linking to another path.
-        q = P / 'dirA' / 'fileAA'
-        with self.assertRaises(NotImplementedError):
-            p.link_to(q)
-
     def test_rename(self):
         P = self.cls(BASE)
         p = P / 'fileA'
@@ -2021,15 +2011,6 @@ class _BasePathTest(object):
         self.assertTrue(link.is_dir())
         self.assertTrue(list(link.iterdir()))
 
-    @unittest.skipIf(support.can_symlink(), "symlink support is present")
-    def test_symlink_to_not_implemented(self):
-        P = self.cls(BASE)
-        target = P / 'fileA'
-        # Symlinking a path target.
-        link = P / 'dirA' / 'linkAA'
-        with self.assertRaises(NotImplementedError):
-            link.symlink_to(target)
-
     def test_is_dir(self):
         P = self.cls(BASE)
         self.assertTrue((P / 'dirA').is_dir())

diff --git a/Misc/NEWS.d/next/Library/2019-11-15-18-06-04.bpo-38811.AmdQ6M.rst b/Misc/NEWS.d/next/Library/2019-11-15-18-06-04.bpo-38811.AmdQ6M.rst
deleted file mode 100644 (file)
index 0e4a7f5..0000000
--- a/Misc/NEWS.d/next/Library/2019-11-15-18-06-04.bpo-38811.AmdQ6M.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix an unhandled exception in :mod:`pathlib` when :meth:`os.link` is missing. Patch by Toke Høiland-Jørgensen.