mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Issue #5117: Case normalization was needed on ntpath.relpath(). And
fixed root directory issue on posixpath.relpath(). (Ported working fixes from ntpath)
This commit is contained in:
parent
08654e18ee
commit
b08820ad40
5 changed files with 27 additions and 4 deletions
|
@ -394,6 +394,15 @@ class PosixPathTest(unittest.TestCase):
|
|||
"../"+curdir+"/a/b")
|
||||
self.assertEqual(posixpath.relpath("a", "b/c"), "../../a")
|
||||
self.assertEqual(posixpath.relpath("a", "a"), ".")
|
||||
self.assertEqual(posixpath.relpath("/foo/bar/bat", "/x/y/z"), '../../../foo/bar/bat')
|
||||
self.assertEqual(posixpath.relpath("/foo/bar/bat", "/foo/bar"), 'bat')
|
||||
self.assertEqual(posixpath.relpath("/foo/bar/bat", "/"), 'foo/bar/bat')
|
||||
self.assertEqual(posixpath.relpath("/", "/foo/bar/bat"), '../../..')
|
||||
self.assertEqual(posixpath.relpath("/foo/bar/bat", "/x"), '../foo/bar/bat')
|
||||
self.assertEqual(posixpath.relpath("/x", "/foo/bar/bat"), '../../../x')
|
||||
self.assertEqual(posixpath.relpath("/", "/"), '.')
|
||||
self.assertEqual(posixpath.relpath("/a", "/a"), '.')
|
||||
self.assertEqual(posixpath.relpath("/a/b", "/a/b"), '.')
|
||||
finally:
|
||||
os.getcwd = real_getcwd
|
||||
|
||||
|
@ -412,6 +421,15 @@ class PosixPathTest(unittest.TestCase):
|
|||
b"../"+curdir+b"/a/b")
|
||||
self.assertEqual(posixpath.relpath(b"a", b"b/c"), b"../../a")
|
||||
self.assertEqual(posixpath.relpath(b"a", b"a"), b".")
|
||||
self.assertEqual(posixpath.relpath(b"/foo/bar/bat", b"/x/y/z"), b'../../../foo/bar/bat')
|
||||
self.assertEqual(posixpath.relpath(b"/foo/bar/bat", b"/foo/bar"), b'bat')
|
||||
self.assertEqual(posixpath.relpath(b"/foo/bar/bat", b"/"), b'foo/bar/bat')
|
||||
self.assertEqual(posixpath.relpath(b"/", b"/foo/bar/bat"), b'../../..')
|
||||
self.assertEqual(posixpath.relpath(b"/foo/bar/bat", b"/x"), b'../foo/bar/bat')
|
||||
self.assertEqual(posixpath.relpath(b"/x", b"/foo/bar/bat"), b'../../../x')
|
||||
self.assertEqual(posixpath.relpath(b"/", b"/"), b'.')
|
||||
self.assertEqual(posixpath.relpath(b"/a", b"/a"), b'.')
|
||||
self.assertEqual(posixpath.relpath(b"/a/b", b"/a/b"), b'.')
|
||||
|
||||
self.assertRaises(TypeError, posixpath.relpath, b"bytes", "str")
|
||||
self.assertRaises(TypeError, posixpath.relpath, "str", b"bytes")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue