Changeset 381 for python

Timestamp:

Mar 13, 2014, 4:58:53 PM (11 years ago)

Author:

dmik

Message:

Add OS/2 version of os.path.relpath.

Based on the NT version (with a bug fix related to
trailing slashes).

Location:

python/trunk/Lib

Files:

• os2emxpath.py (modified) (1 diff)
• os2knixpath.py (modified) (1 diff)

python/trunk/Lib/os2emxpath.py

@@ -158 +158 @@
 
 supports_unicode_filenames = False
+
+
+def relpath(path, start=curdir):
+    """Return a relative version of a path"""
+
+    if not path:
+        raise ValueError("no path specified")
+    start_list = abspath(start).split(sep)
+    path_list = abspath(path).split(sep)
+    # Remove empty components after trailing slashes
+    if (start_list[-1] == ''):
+        start_list.pop()
+    if (path_list[-1] == ''):
+        path_list.pop()
+    if start_list[0].lower() != path_list[0].lower():
+        unc_path, rest = splitunc(path)
+        unc_start, rest = splitunc(start)
+        if bool(unc_path) ^ bool(unc_start):
+            raise ValueError("Cannot mix UNC and non-UNC paths (%s and %s)"
+                                                                % (path, start))
+        else:
+            raise ValueError("path is on drive %s, start on drive %s"
+                                                % (path_list[0], start_list[0]))
+    # Work out how much of the filepath is shared by start and path.
+    for i in range(min(len(start_list), len(path_list))):
+        if start_list[i].lower() != path_list[i].lower():
+            break
+    else:
+        i += 1
+
+    rel_list = [pardir] * (len(start_list)-i) + path_list[i:]
+    if not rel_list:
+        return curdir
+    return join(*rel_list)

python/trunk/Lib/os2knixpath.py

@@ -246 +246 @@
 
 supports_unicode_filenames = False
+
+
+def relpath(path, start=curdir):
+    """Return a relative version of a path"""
+
+    if not path:
+        raise ValueError("no path specified")
+    start_list = abspath(start).split(sep)
+    path_list = abspath(path).split(sep)
+    # Remove empty components after trailing slashes
+    if (start_list[-1] == ''):
+        start_list.pop()
+    if (path_list[-1] == ''):
+        path_list.pop()
+    if start_list[0].lower() != path_list[0].lower():
+        unc_path, rest = splitunc(path)
+        unc_start, rest = splitunc(start)
+        if bool(unc_path) ^ bool(unc_start):
+            raise ValueError("Cannot mix UNC and non-UNC paths (%s and %s)"
+                                                                % (path, start))
+        else:
+            raise ValueError("path is on drive %s, start on drive %s"
+                                                % (path_list[0], start_list[0]))
+    # Work out how much of the filepath is shared by start and path.
+    for i in range(min(len(start_list), len(path_list))):
+        if start_list[i].lower() != path_list[i].lower():
+            break
+    else:
+        i += 1
+
+    rel_list = [pardir] * (len(start_list)-i) + path_list[i:]
+    if not rel_list:
+        return curdir
+    return join(*rel_list)