diff options
| -rw-r--r-- | .github/workflows/lint_mypy.yml | 2 | ||||
| -rw-r--r-- | mesonbuild/mlog.py | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/lint_mypy.yml b/.github/workflows/lint_mypy.yml index 54535b3..d74043b 100644 --- a/.github/workflows/lint_mypy.yml +++ b/.github/workflows/lint_mypy.yml @@ -30,4 +30,4 @@ jobs: with: python-version: '3.x' - run: python -m pip install mypy - - run: mypy --follow-imports=skip mesonbuild/mtest.py mesonbuild/minit.py mesonbuild/mintro.py mesonbuild/msetup.py mesonbuild/wrap tools/ mesonbuild/modules/fs.py mesonbuild/dependencies/boost.py mesonbuild/dependencies/mpi.py mesonbuild/dependencies/hdf5.py mesonbuild/compilers/mixins/intel.py + - run: mypy --follow-imports=skip mesonbuild/mtest.py mesonbuild/minit.py mesonbuild/mintro.py mesonbuild/msetup.py mesonbuild/wrap tools/ mesonbuild/modules/fs.py mesonbuild/dependencies/boost.py mesonbuild/dependencies/mpi.py mesonbuild/dependencies/hdf5.py mesonbuild/compilers/mixins/intel.py mesonbuild/mlog.py diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py index b28eca1..64c16f5 100644 --- a/mesonbuild/mlog.py +++ b/mesonbuild/mlog.py @@ -227,7 +227,7 @@ def _log_error(severity: str, *rargs: T.Union[str, AnsiDecorator], from .environment import build_filename from .mesonlib import MesonException - # The tping requirements here are non-obvious. Lists are invariant, + # The typing requirements here are non-obvious. Lists are invariant, # therefore T.List[A] and T.List[T.Union[A, B]] are not able to be joined if severity == 'warning': label = [yellow('WARNING:')] # type: T.List[T.Union[str, AnsiDecorator]] @@ -257,14 +257,14 @@ def _log_error(severity: str, *rargs: T.Union[str, AnsiDecorator], if log_fatal_warnings: raise MesonException("Fatal warnings enabled, aborting") -def error(*args: T.Union[str, AnsiDecorator], once: bool = False, **kwargs: T.Any) -> None: - return _log_error('error', *args, **kwargs, is_error=True, once=once) +def error(*args: T.Union[str, AnsiDecorator], **kwargs: T.Any) -> None: + return _log_error('error', *args, **kwargs, is_error=True) -def warning(*args: T.Union[str, AnsiDecorator], once: bool = False, **kwargs: T.Any) -> None: - return _log_error('warning', *args, **kwargs, is_error=True, once=once) +def warning(*args: T.Union[str, AnsiDecorator], **kwargs: T.Any) -> None: + return _log_error('warning', *args, **kwargs, is_error=True) -def deprecation(*args: T.Union[str, AnsiDecorator], once: bool = False, **kwargs: T.Any) -> None: - return _log_error('deprecation', *args, **kwargs, is_error=True, once=once) +def deprecation(*args: T.Union[str, AnsiDecorator], **kwargs: T.Any) -> None: + return _log_error('deprecation', *args, **kwargs, is_error=True) def get_relative_path(target: Path, current: Path) -> Path: """Get the path to target from current""" @@ -287,9 +287,9 @@ def exception(e: Exception, prefix: T.Optional[AnsiDecorator] = None) -> None: log() args = [] # type: T.List[T.Union[AnsiDecorator, str]] if hasattr(e, 'file') and hasattr(e, 'lineno') and hasattr(e, 'colno'): - # Mypy can't figure this out, and it's pretty easy to vidual inspect + # Mypy doesn't follow hasattr, and it's pretty easy to visually inspect # that this is correct, so we'll just ignore it. - path = get_relative_path(Path(e.file), Path(os.getcwd())) + path = get_relative_path(Path(e.file), Path(os.getcwd())) # type: ignore args.append('%s:%d:%d:' % (path, e.lineno, e.colno)) # type: ignore if prefix: args.append(prefix) |