interpreter: rename EnvironmentVariablesObject -> EnvironmentVariablesHolder

This is more consistent with other Holder classes
pull/9185/head
Dylan Baker 3 years ago
parent 43f942be34
commit 81f5cee218
  1. 2
      mesonbuild/interpreter/interpreter.py
  2. 6
      mesonbuild/interpreter/interpreterobjects.py

@ -395,7 +395,7 @@ class Interpreter(InterpreterBase, HoldableObject):
build.Data: OBJ.DataHolder, build.Data: OBJ.DataHolder,
build.InstallDir: OBJ.InstallDirHolder, build.InstallDir: OBJ.InstallDirHolder,
build.IncludeDirs: OBJ.IncludeDirsHolder, build.IncludeDirs: OBJ.IncludeDirsHolder,
build.EnvironmentVariables: OBJ.EnvironmentVariablesObject, build.EnvironmentVariables: OBJ.EnvironmentVariablesHolder,
compilers.RunResult: compilerOBJ.TryRunResultHolder, compilers.RunResult: compilerOBJ.TryRunResultHolder,
dependencies.ExternalLibrary: OBJ.ExternalLibraryHolder, dependencies.ExternalLibrary: OBJ.ExternalLibraryHolder,
coredata.UserFeatureOption: OBJ.FeatureOptionHolder, coredata.UserFeatureOption: OBJ.FeatureOptionHolder,

@ -238,7 +238,7 @@ class RunProcess(MesonInterpreterObject):
_ENV_SEPARATOR_KW = KwargInfo('separator', str, default=os.pathsep) _ENV_SEPARATOR_KW = KwargInfo('separator', str, default=os.pathsep)
class EnvironmentVariablesObject(ObjectHolder[build.EnvironmentVariables], MutableInterpreterObject): class EnvironmentVariablesHolder(ObjectHolder[build.EnvironmentVariables], MutableInterpreterObject):
def __init__(self, obj: build.EnvironmentVariables, interpreter: 'Interpreter'): def __init__(self, obj: build.EnvironmentVariables, interpreter: 'Interpreter'):
super().__init__(obj, interpreter) super().__init__(obj, interpreter)
@ -251,9 +251,9 @@ class EnvironmentVariablesObject(ObjectHolder[build.EnvironmentVariables], Mutab
repr_str = "<{0}: {1}>" repr_str = "<{0}: {1}>"
return repr_str.format(self.__class__.__name__, self.held_object.envvars) return repr_str.format(self.__class__.__name__, self.held_object.envvars)
def __deepcopy__(self, memo: T.Dict[str, object]) -> 'EnvironmentVariablesObject': def __deepcopy__(self, memo: T.Dict[str, object]) -> 'EnvironmentVariablesHolder':
# Avoid trying to copy the intepreter # Avoid trying to copy the intepreter
return EnvironmentVariablesObject(copy.deepcopy(self.held_object), self.interpreter) return EnvironmentVariablesHolder(copy.deepcopy(self.held_object), self.interpreter)
def warn_if_has_name(self, name: str) -> None: def warn_if_has_name(self, name: str) -> None:
# Multiple append/prepend operations was not supported until 0.58.0. # Multiple append/prepend operations was not supported until 0.58.0.

Loading…
Cancel
Save