FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 09:57:15 +01:00
Code Issues Projects Releases Wiki Activity

Removed the split functions from Node.py

Browse Source
This commit is contained in:
Thomas Nagy 2015-12-22 18:12:20 +01:00
parent 18449feb5e
commit 8b74beb233
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TODO
View File

@ -3,7 +3,6 @@ Waf 1.9
* Reduce the key size in bld.task_sigs * Reduce the key size in bld.task_sigs
* Provide a more efficient ConfigSet implementation * Provide a more efficient ConfigSet implementation
* Remove the split functions from Utils
* Ensure _cache.py are valid python files * Ensure _cache.py are valid python files
* Include the tool 'nobuild' by default * Include the tool 'nobuild' by default
* Set cflags in the beginning / cppflags at the end * Set cflags in the beginning / cppflags at the end
@ -21,3 +20,7 @@ Waf 1.9
and all other issues listed on https://github.com/waf-project/waf/issues and all other issues listed on https://github.com/waf-project/waf/issues
Done
----
* Remove the split functions from Utils

18
waflib/Node.py
View File

@ -59,12 +59,6 @@ Ant patterns for files and folders to exclude while doing the
recursive traversal in :py:meth:`waflib.Node.Node.ant_glob` recursive traversal in :py:meth:`waflib.Node.Node.ant_glob`
""" """
# TODO remove in waf 1.9
split_path = Utils.split_path
split_path_unix = Utils.split_path_unix
split_path_cygwin = Utils.split_path_cygwin
split_path_win32 = Utils.split_path_win32
class Node(object): class Node(object):
""" """
This class is organized in two parts This class is organized in two parts
@ -297,7 +291,7 @@ class Node(object):
""" """
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
cur = self cur = self
for x in lst: for x in lst:
@ -349,7 +343,7 @@ class Node(object):
:type lst: string or list of string :type lst: string or list of string
""" """
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
cur = self cur = self
for x in lst: for x in lst:
@ -374,7 +368,7 @@ class Node(object):
:type lst: string or list of string :type lst: string or list of string
""" """
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
cur = self cur = self
for x in lst: for x in lst:
@ -724,7 +718,7 @@ class Node(object):
:type lst: string or list of string :type lst: string or list of string
""" """
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
node = self.get_bld().search_node(lst) node = self.get_bld().search_node(lst)
if not node: if not node:
@ -746,7 +740,7 @@ class Node(object):
:type lst: string or list of string :type lst: string or list of string
""" """
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
node = self.get_bld().search_node(lst) node = self.get_bld().search_node(lst)
if node: if node:
@ -773,7 +767,7 @@ class Node(object):
:type lst: string or list of string :type lst: string or list of string
""" """
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
node = self.find_node(lst) node = self.find_node(lst)
try: try:

4
waflib/extras/unc.py
View File

@ -51,7 +51,7 @@ from waflib import Node, Utils, Context
def find_resource(self, lst): def find_resource(self, lst):
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in Node.split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
if lst[0].startswith('\\\\'): if lst[0].startswith('\\\\'):
if len(lst) < 3: if len(lst) < 3:
@ -71,7 +71,7 @@ def find_resource(self, lst):
def find_or_declare(self, lst): def find_or_declare(self, lst):
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in Node.split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
if lst[0].startswith('\\\\'): if lst[0].startswith('\\\\'):
if len(lst) < 3: if len(lst) < 3:

2
waflib/extras/win32_opts.py
View File

@ -148,7 +148,7 @@ if Utils.is_win32:
def find_or_declare_win32(self, lst): def find_or_declare_win32(self, lst):
# assuming that "find_or_declare" is called before the build starts, remove the calls to os.path.isfile # assuming that "find_or_declare" is called before the build starts, remove the calls to os.path.isfile
if isinstance(lst, str): if isinstance(lst, str):
lst = [x for x in Node.split_path(lst) if x and x != '.'] lst = [x for x in Utils.split_path(lst) if x and x != '.']
node = self.get_bld().search(lst) node = self.get_bld().search(lst)
if node: if node: