[Python-checkins] r85694 - in python/branches/release27-maint: Lib/ntpath.py Lib/posixpath.py Lib/test/test_ntpath.py Lib/test/test_posixpath.py Misc/NEWS

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Mon Oct 18 15:55:29 2010
New Revision: 85694

Log:
Issue #5117: Fixed root directory related issue on posixpath.relpath() and
ntpath.relpath().

Modified:
   python/branches/release27-maint/Lib/ntpath.py
   python/branches/release27-maint/Lib/posixpath.py
   python/branches/release27-maint/Lib/test/test_ntpath.py
   python/branches/release27-maint/Lib/test/test_posixpath.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/ntpath.py
==============================================================================
--- python/branches/release27-maint/Lib/ntpath.py	(original)
+++ python/branches/release27-maint/Lib/ntpath.py	Mon Oct 18 15:55:29 2010
@@ -488,8 +488,8 @@
 
     if not path:
         raise ValueError("no path specified")
-    start_list = abspath(start).split(sep)
-    path_list = abspath(path).split(sep)
+    start_list = [x for x in abspath(start).split(sep) if x]
+    path_list = [x for x in abspath(path).split(sep) if x]
     if start_list[0].lower() != path_list[0].lower():
         unc_path, rest = splitunc(path)
         unc_start, rest = splitunc(start)

Modified: python/branches/release27-maint/Lib/posixpath.py
==============================================================================
--- python/branches/release27-maint/Lib/posixpath.py	(original)
+++ python/branches/release27-maint/Lib/posixpath.py	Mon Oct 18 15:55:29 2010
@@ -403,8 +403,8 @@
     if not path:
         raise ValueError("no path specified")
 
-    start_list = abspath(start).split(sep)
-    path_list = abspath(path).split(sep)
+    start_list = [x for x in abspath(start).split(sep) if x]
+    path_list = [x for x in abspath(path).split(sep) if x]
 
     # Work out how much of the filepath is shared by start and path.
     i = len(commonprefix([start_list, path_list]))

Modified: python/branches/release27-maint/Lib/test/test_ntpath.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_ntpath.py	(original)
+++ python/branches/release27-maint/Lib/test/test_ntpath.py	Mon Oct 18 15:55:29 2010
@@ -178,6 +178,16 @@
         tester('ntpath.relpath("a", "b/c")', '..\\..\\a')
         tester('ntpath.relpath("//conky/mountpoint/a", "//conky/mountpoint/b/c")', '..\\..\\a')
         tester('ntpath.relpath("a", "a")', '.')
+        tester('ntpath.relpath("/foo/bar/bat", "/x/y/z")', '..\\..\\..\\foo\\bar\\bat')
+        tester('ntpath.relpath("/foo/bar/bat", "/foo/bar")', 'bat')
+        tester('ntpath.relpath("/foo/bar/bat", "/")', 'foo\\bar\\bat')
+        tester('ntpath.relpath("/", "/foo/bar/bat")', '..\\..\\..')
+        tester('ntpath.relpath("/foo/bar/bat", "/x")', '..\\foo\\bar\\bat')
+        tester('ntpath.relpath("/x", "/foo/bar/bat")', '..\\..\\..\\x')
+        tester('ntpath.relpath("/", "/")', '.')
+        tester('ntpath.relpath("/a", "/a")', '.')
+        tester('ntpath.relpath("/a/b", "/a/b")', '.')
+        tester('ntpath.relpath("c:/foo", "C:/FOO")', '.')
 
 
 class NtCommonTest(test_genericpath.CommonTest):

Modified: python/branches/release27-maint/Lib/test/test_posixpath.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_posixpath.py	(original)
+++ python/branches/release27-maint/Lib/test/test_posixpath.py	Mon Oct 18 15:55:29 2010
@@ -322,6 +322,15 @@
             self.assertEqual(posixpath.relpath("a/b", "../c"), "../"+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
 

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Mon Oct 18 15:55:29 2010
@@ -60,6 +60,9 @@
 Library
 -------
 
+- Issue #5117: Fixed root directory related issue on posixpath.relpath() and
+  ntpath.relpath().
+
 - Issue 9409: Fix the regex to match all kind of filenames, for interactive
   debugging in doctests.