Avoid redefining LazyObjectConstructor.__strip_extension
This commit is contained in:
parent
4a562bf098
commit
433fc96505
|
@ -1247,17 +1247,18 @@ class LazyObjectConstructor:
|
||||||
env = self.env
|
env = self.env
|
||||||
o = env._dxx_pch_object(target='%s%s%s' % (self.user_settings.builddir, transform_target(self, srcname), env["OBJSUFFIX"]), source=srcname)
|
o = env._dxx_pch_object(target='%s%s%s' % (self.user_settings.builddir, transform_target(self, srcname), env["OBJSUFFIX"]), source=srcname)
|
||||||
return o
|
return o
|
||||||
|
@staticmethod
|
||||||
|
def __strip_extension(_,name):
|
||||||
|
return os.path.splitext(name)[0]
|
||||||
def __lazy_objects(self,name,source):
|
def __lazy_objects(self,name,source):
|
||||||
try:
|
try:
|
||||||
return self.__lazy_object_cache[name]
|
return self.__lazy_object_cache[name]
|
||||||
except KeyError as e:
|
except KeyError as e:
|
||||||
def __strip_extension(self,name):
|
|
||||||
return os.path.splitext(name)[0]
|
|
||||||
value = []
|
value = []
|
||||||
for s in source:
|
for s in source:
|
||||||
if isinstance(s, str):
|
if isinstance(s, str):
|
||||||
s = {'source': [s]}
|
s = {'source': [s]}
|
||||||
transform_target = s.get('transform_target', __strip_extension)
|
transform_target = s.get('transform_target', self.__strip_extension)
|
||||||
value.extend([self.__get_lazy_object(srcname, transform_target) for srcname in s['source']])
|
value.extend([self.__get_lazy_object(srcname, transform_target) for srcname in s['source']])
|
||||||
self.__lazy_object_cache[name] = value
|
self.__lazy_object_cache[name] = value
|
||||||
return value
|
return value
|
||||||
|
|
Loading…
Reference in a new issue