From 1a03cd16401d2926bba902ffc5df30911b5c9394 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 3 Mar 2014 20:26:19 +0000 Subject: lib/oe: drop custom implementation of oe.path.relative As we now require Python 2.7 and os.path.relpath() was added in 2.6 we can now drop the reimplementation in oe.path. oe.path.relative is simple now a wrapper that changes the order of the arguments and it's use discouraged. Signed-off-by: Ross Burton Signed-off-by: Saul Wold --- meta/lib/oe/path.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'meta/lib/oe/path.py') diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 46783f8668..413ebfb395 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -21,23 +21,7 @@ def relative(src, dest): foo/bar """ - if hasattr(os.path, "relpath"): - return os.path.relpath(dest, src) - else: - destlist = os.path.normpath(dest).split(os.path.sep) - srclist = os.path.normpath(src).split(os.path.sep) - - # Find common section of the path - common = os.path.commonprefix([destlist, srclist]) - commonlen = len(common) - - # Climb back to the point where they differentiate - relpath = [ os.path.pardir ] * (len(srclist) - commonlen) - if commonlen < len(destlist): - # Add remaining portion - relpath += destlist[commonlen:] - - return os.path.sep.join(relpath) + return os.path.relpath(dest, src) def make_relative_symlink(path): """ Convert an absolute symlink to a relative one """ -- cgit 1.2.3-korg