diff options
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/compiler.py | 6 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 8 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter/mesonmain.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py index 01a6989..174c268 100644 --- a/mesonbuild/interpreter/compiler.py +++ b/mesonbuild/interpreter/compiler.py @@ -1,6 +1,6 @@ # SPDX-Licnese-Identifier: Apache-2.0 # Copyright 2012-2021 The Meson development team -# Copyright © 2021 Intel Corpration +# Copyright © 2021 Intel Corporation import enum import functools @@ -250,7 +250,7 @@ class CompilerHolder(ObjectHolder['Compiler']): deps = next_deps deps = final_deps else: - # Ensure that we alway return a new instance + # Ensure that we always return a new instance deps = deps.copy() return deps, self._dep_msg(deps, endl) @@ -622,7 +622,7 @@ class CompilerHolder(ObjectHolder['Compiler']): def _has_argument_impl(self, arguments: T.Union[str, T.List[str]], mode: _TestMode = _TestMode.COMPILER) -> bool: - """Shared implementaiton for methods checking compiler and linker arguments.""" + """Shared implementation for methods checking compiler and linker arguments.""" # This simplifies the callers if isinstance(arguments, str): arguments = [arguments] diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 7e2a934..b82525f 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -424,7 +424,7 @@ class Interpreter(InterpreterBase, HoldableObject): ''' Build a mapping of `HoldableObject` base classes to their corresponding `ObjectHolder`s. The difference to `self.holder_map` - is that the keys here define an upper bound instead of requireing an + is that the keys here define an upper bound instead of requiring an exact match. The mappings defined here are only used when there was no direct hit @@ -574,7 +574,7 @@ class Interpreter(InterpreterBase, HoldableObject): try: # check if stable module exists mod = self._import_module(plainname, required) - # XXX: this is acutally not helpful, since it doesn't do a version check + # XXX: this is actually not helpful, since it doesn't do a version check mlog.warning(f'Module {modname} is now stable, please use the {plainname} module instead.') return mod except InvalidArguments: @@ -1039,7 +1039,7 @@ external dependencies (including libraries) must go to "dependencies".''') self.project_default_options = mesonlib.stringlistify(kwargs.get('default_options', [])) self.project_default_options = coredata.create_options_dict(self.project_default_options, self.subproject) - # If this is the first invocation we alway sneed to initialize + # If this is the first invocation we always need to initialize # builtins, if this is a subproject that is new in a re-invocation we # need to initialize builtins for that if self.environment.first_invocation or (self.subproject != '' and self.subproject not in self.coredata.initialized_subprojects): @@ -1685,7 +1685,7 @@ external dependencies (including libraries) must go to "dependencies".''') # Set this to None to satisfy process_kwargs kwargs['build_always'] = None - # These are are nullaable so that we can konw whether they're explicitly + # These are are nullaable so that we can know whether they're explicitly # set or not. If they haven't been overwritten, set them to their true # default if kwargs['build_by_default'] is None: diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index b0447e6..b4dc96c 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -252,7 +252,7 @@ class EnvironmentVariablesHolder(ObjectHolder[build.EnvironmentVariables], Mutab return repr_str.format(self.__class__.__name__, self.held_object.envvars) def __deepcopy__(self, memo: T.Dict[str, object]) -> 'EnvironmentVariablesHolder': - # Avoid trying to copy the intepreter + # Avoid trying to copy the interpreter return EnvironmentVariablesHolder(copy.deepcopy(self.held_object), self.interpreter) def warn_if_has_name(self, name: str) -> None: @@ -687,7 +687,7 @@ class NullSubprojectInterpreter(HoldableObject): # TODO: This should really be an `ObjectHolder`, but the additional stuff in this # class prevents this. Thus, this class should be split into a pure -# `ObjectHolder` and a class specifically for stroing in `Interpreter`. +# `ObjectHolder` and a class specifically for storing in `Interpreter`. class SubprojectHolder(MesonInterpreterObject): def __init__(self, subinterpreter: T.Union['Interpreter', NullSubprojectInterpreter], diff --git a/mesonbuild/interpreter/mesonmain.py b/mesonbuild/interpreter/mesonmain.py index c35fddc..5c4d3ed 100644 --- a/mesonbuild/interpreter/mesonmain.py +++ b/mesonbuild/interpreter/mesonmain.py @@ -360,7 +360,7 @@ class MesonMain(MesonInterpreterObject): else: # dependency('foo') without specifying static kwarg should find this # override regardless of the static value here. But do not raise error - # if it has already been overridden, which would happend when overriding + # if it has already been overridden, which would happen when overriding # static and shared separately: # meson.override_dependency('foo', shared_dep, static: false) # meson.override_dependency('foo', static_dep, static: true) diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 310f281..03091bb 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -82,12 +82,12 @@ def _install_mode_validator(mode: T.List[T.Union[str, bool, int]]) -> T.Optional def _install_mode_convertor(mode: T.Optional[T.List[T.Union[str, bool, int]]]) -> FileMode: - """Convert the DSL form of the `install_mode` keyword arugment to `FileMode` + """Convert the DSL form of the `install_mode` keyword argument to `FileMode` This is not required, and if not required returns None TODO: It's not clear to me why this needs to be None and not just return an - emtpy FileMode. + empty FileMode. """ # this has already been validated by the validator return FileMode(*(m if isinstance(m, str) else None for m in mode)) |