context is not needed for impl_getpath

This commit is contained in:
2018-09-06 23:16:17 +02:00
parent 4b0c142e3e
commit 09c9fa4906
11 changed files with 30 additions and 42 deletions

View File

@ -231,10 +231,9 @@ class OptionDescriptionWalk(CacheOptionDescription):
option_bag):
option = option_bag.option
dynopt = option.getsubdyn()
rootpath = dynopt.impl_getpath(option_bag.config_bag.context)
rootpath = dynopt.impl_getpath()
ori_index = len(rootpath) + 1
subpaths = [rootpath] + option.impl_getpath(
option_bag.config_bag.context)[ori_index:].split('.')[:-1]
subpaths = [rootpath] + option.impl_getpath()[ori_index:].split('.')[:-1]
for suffix in dynopt.impl_get_suffixes(option_bag):
subpath = '.'.join([subp + suffix for subp in subpaths])
if isinstance(option, OnlyOption):
@ -268,7 +267,7 @@ class OptionDescriptionWalk(CacheOptionDescription):
config_bag)
for doption in self.build_dynoptions(option_bag):
if byname == doption.impl_getname():
dpath = doption.impl_getpath(config_bag.context)
dpath = doption.impl_getpath()
return (dpath, doption)
elif byname == name:
return (path, option)
@ -327,7 +326,7 @@ class OptionDescriptionWalk(CacheOptionDescription):
if config_bag.context.cfgimpl_get_description() == self:
subpath = ''
else:
subpath = self.impl_getpath(config_bag.context)
subpath = self.impl_getpath()
option_bag = OptionBag()
option_bag.set_option(child,
subpath,