Skip to content

Commit

Permalink
bpo-38811: Check for presence of os.link method in pathlib. (pythonGH…
Browse files Browse the repository at this point in the history
…-17170)

Fix also the Path.symplink() method implementation for the case when
symlinks are not supported.
  • Loading branch information
tohojo authored and serhiy-storchaka committed Nov 17, 2019
1 parent 645005e commit 111772f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Lib/pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,12 @@ def lchmod(self, pathobj, mode):

unlink = os.unlink

link_to = os.link
if hasattr(os, "link"):
link_to = os.link
else:
@staticmethod
def link_to(self, target):
raise NotImplementedError("os.link() not available on this system")

rmdir = os.rmdir

Expand All @@ -430,6 +435,7 @@ def lchmod(self, pathobj, mode):
if supports_symlinks:
symlink = os.symlink
else:
@staticmethod
def symlink(a, b, target_is_directory):
raise NotImplementedError("symlink() not available on this system")
else:
Expand Down
19 changes: 19 additions & 0 deletions Lib/test/test_pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,7 @@ def test_rmdir(self):
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'
Expand All @@ -1778,6 +1779,15 @@ def test_link_to(self):
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'
Expand Down Expand Up @@ -2011,6 +2021,15 @@ def test_symlink_to(self):
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())
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix an unhandled exception in :mod:`pathlib` when :meth:`os.link` is missing. Patch by Toke Høiland-Jørgensen.

0 comments on commit 111772f

Please sign in to comment.