diff --git a/IPython/utils/path.py b/IPython/utils/path.py index def5301..1d5b302 100644 --- a/IPython/utils/path.py +++ b/IPython/utils/path.py @@ -515,7 +515,7 @@ def get_security_file(filename, profile='default'): def link(src, dst): - """Attempts to hardlink 'src' to 'dst', errno on failure (or 0 on success). + """Hard links ``src`` to ``dst``, returning 0 or errno. Note that the special errno ``1998`` will be returned if ``os.link`` isn't supported by the operating system. diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py index 04ea0b8..ee0fdb0 100644 --- a/IPython/utils/tests/test_path.py +++ b/IPython/utils/tests/test_path.py @@ -582,7 +582,7 @@ class TestLinkOrCopy(object): nt.assert_equals(os.stat(a).st_ino, os.stat(b).st_ino, "%r and %r do not reference the same indoes" %(a, b)) - def assert_content_eqal(self, a, b): + def assert_content_equal(self, a, b): with nested(open(a), open(b)) as (a_f, b_f): nt.assert_equals(a_f.read(), b_f.read()) @@ -614,7 +614,7 @@ class TestLinkOrCopy(object): del os.link dst = self.dst("target") path.link_or_copy(self.src, dst) - self.assert_content_eqal(self.src, dst) + self.assert_content_equal(self.src, dst) self.assert_inode_not_equal(self.src, dst) finally: os.link = real_link @@ -623,4 +623,4 @@ class TestLinkOrCopy(object): def test_windows(self): dst = self.dst("target") path.link_or_copy(self.src, dst) - self.assert_content_eqal(self.src, dst) + self.assert_content_equal(self.src, dst)