FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimize Node.path_from

This commit is contained in:
Thomas Nagy 2016-12-21 19:50:29 +01:00
parent 09713f49e4
commit 900d6b891c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/apis/wscript
View File

@ -56,7 +56,8 @@ def test(ctx):
tt('path_from', dd.path_from(pp), os.path.split(os.getcwd())[1]) tt('path_from', dd.path_from(pp), os.path.split(os.getcwd())[1])
tt('path_from (reverse)', pp.path_from(dd), '..') tt('path_from (reverse)', pp.path_from(dd), '..')
tt('same path', pp.path_from(pp), '.') tt('same path', pp.path_from(pp), '.')
tt('same_root', bld.root.path_from(bld.root), '.') tt('path from root is abspath()', pp.path_from(bld.root), pp.abspath())
tt('root from root', bld.root.path_from(bld.root), bld.root.abspath())
tt('root height', bld.root.height(), 0) tt('root height', bld.root.height(), 0)
tt('self height', dd.height(), len(absdir)) tt('self height', dd.height(), len(absdir))

13
waflib/Node.py
View File

@ -430,10 +430,9 @@ class Node(object):
:param node: path to use as a reference :param node: path to use as a reference
:type node: :py:class:`waflib.Node.Node` :type node: :py:class:`waflib.Node.Node`
:returns: the relative path :returns: a relative path or an absolute one if that is better
:rtype: string :rtype: string
""" """
c1 = self c1 = self
c2 = node c2 = node
@ -461,13 +460,11 @@ class Node(object):
c2 = c2.parent c2 = c2.parent
if c1.parent: if c1.parent:
for i in range(up): lst.extend(['..'] * up)
lst.append('..') lst.reverse()
return os.sep.join(lst) or '.'
else: else:
if lst and not Utils.is_win32: return self.abspath()
lst.append('')
lst.reverse()
return os.sep.join(lst) or '.'
def abspath(self): def abspath(self):
""" """