Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add some type hints to the ExternalProgram class

This commit is contained in:
Nirbheek Chauhan 2020-09-08 18:19:32 +05:30 committed by Nirbheek Chauhan
parent 757b838d81
commit 863492ae1a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mesonbuild/dependencies/base.py
View File

@ -1897,7 +1897,7 @@ class ExternalProgram:
return ExternalProgram(command, silent=True) return ExternalProgram(command, silent=True)
@staticmethod @staticmethod
def _shebang_to_cmd(script): def _shebang_to_cmd(script: str) -> T.Optional[list]:
""" """
Check if the file has a shebang and manually parse it to figure out Check if the file has a shebang and manually parse it to figure out
the interpreter to use. This is useful if the script is not executable the interpreter to use. This is useful if the script is not executable
@ -1941,7 +1941,7 @@ class ExternalProgram:
except Exception as e: except Exception as e:
mlog.debug(e) mlog.debug(e)
mlog.debug('Unusable script {!r}'.format(script)) mlog.debug('Unusable script {!r}'.format(script))
return False return None
def _is_executable(self, path): def _is_executable(self, path):
suffix = os.path.splitext(path)[-1].lower()[1:] suffix = os.path.splitext(path)[-1].lower()[1:]
@ -1953,9 +1953,9 @@ class ExternalProgram:
return not os.path.isdir(path) return not os.path.isdir(path)
return False return False
def _search_dir(self, name, search_dir): def _search_dir(self, name: str, search_dir: T.Optional[str]) -> T.Optional[list]:
if search_dir is None: if search_dir is None:
return False return None
trial = os.path.join(search_dir, name) trial = os.path.join(search_dir, name)
if os.path.exists(trial): if os.path.exists(trial):
if self._is_executable(trial): if self._is_executable(trial):
@ -1970,9 +1970,9 @@ class ExternalProgram:
trial_ext = '{}.{}'.format(trial, ext) trial_ext = '{}.{}'.format(trial, ext)
if os.path.exists(trial_ext): if os.path.exists(trial_ext):
return [trial_ext] return [trial_ext]
return False return None
def _search_windows_special_cases(self, name, command): def _search_windows_special_cases(self, name: str, command: str) -> list:
''' '''
Lots of weird Windows quirks: Lots of weird Windows quirks:
1. PATH search for @name returns files with extensions from PATHEXT, 1. PATH search for @name returns files with extensions from PATHEXT,
@ -2015,7 +2015,7 @@ class ExternalProgram:
return commands return commands
return [None] return [None]
def _search(self, name, search_dir): def _search(self, name: str, search_dir: T.Optional[str]) -> list:
''' '''
Search in the specified dir for the specified executable by name Search in the specified dir for the specified executable by name
and if not found search in PATH and if not found search in PATH