Patchwork [1/3] lib/oe: drop custom implementation of oe.path.relative

login
register
mail settings
Submitter Ross Burton
Date March 4, 2014, 4:46 p.m.
Message ID <1393951562-14251-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/67961/
State New
Headers show

Comments

Ross Burton - March 4, 2014, 4:46 p.m.
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 <ross.burton@intel.com>
---
 meta/lib/oe/path.py |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

Patch

diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 46783f8..413ebfb 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 """