Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

context is not needed for impl_getpath

Browse Source
This commit is contained in:
Emmanuel Garette
2018-09-06 23:16:17 +02:00
parent 4b0c142e3e
commit 09c9fa4906
11 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tiramisu/setting.py
View File

@ -138,7 +138,7 @@ class OptionBag:
index,
config_bag):
if path is None:
path = option.impl_getpath(config_bag.context)
path = option.impl_getpath()
self.path = path
self.index = index
self.option = option
@ -379,7 +379,7 @@ class Settings(object):
index = option_bag.index
if opt.impl_is_symlinkoption():
opt = opt.impl_getopt()
path = opt.impl_getpath(self._getcontext())
path = opt.impl_getpath()
if apply_requires:
props = config_bag.properties
@ -415,7 +415,7 @@ class Settings(object):
path):
if opt and opt.impl_is_symlinkoption():
opt = opt.impl_getopt()
path = opt.impl_getpath(self._getcontext())
path = opt.impl_getpath()
return self._pp_.getpermissives(path)
def apply_requires(self,
@ -485,7 +485,7 @@ class Settings(object):
if option.issubdyn():
option = option.impl_get_dynoption(option_bag.option._rootpath,
option_bag.option.impl_getsuffix())
reqpath = option.impl_getpath(context)
reqpath = option.impl_getpath()
#FIXME too later!
if reqpath.startswith(option_bag.path + '.'):
raise RequirementError(_("malformed requirements "