summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorToke Høiland-Jørgensen <toke@redhat.com>2019-12-16 12:23:55 (GMT)
committerVictor Stinner <vstinner@python.org>2019-12-16 12:23:55 (GMT)
commit092435e932dee1802784ec28f39454f50fdd879a (patch)
tree7d2649d3fb0766621a0760a5efd86815d7804f38 /Lib
parent1ca8fb187eb320f87a74b82c2a20acb89f429841 (diff)
downloadcpython-092435e932dee1802784ec28f39454f50fdd879a.zip
cpython-092435e932dee1802784ec28f39454f50fdd879a.tar.gz
cpython-092435e932dee1802784ec28f39454f50fdd879a.tar.bz2
bpo-38811: Check for presence of os.link method in pathlib (GH-17225)
Commit 6b5b013bcc22 ("bpo-26978: Implement pathlib.Path.link_to (Using os.link) (GH-12990)") introduced a new link_to method in pathlib. However, this makes pathlib crash when the 'os' module is missing a 'link' method. Fix this by checking for the presence of the 'link' method on pathlib module import, and if it's not present, turn it into a runtime error like those emitted when there is no lchmod() or symlink(). Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Diffstat (limited to 'Lib')
-rw-r--r--Lib/pathlib.py7
-rw-r--r--Lib/test/test_pathlib.py10
2 files changed, 16 insertions, 1 deletions
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index f0537cf..7d1d115 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -418,7 +418,12 @@ class _NormalAccessor(_Accessor):
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
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index b8e7fcc..3232649 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1759,6 +1759,7 @@ 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'
@@ -1778,6 +1779,15 @@ 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'