aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/build.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-06-14 15:36:17 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-06-22 09:13:41 -0700
commitd636b92c1adc1588ff11b6ee4972c4bdd686f433 (patch)
tree65511141ccd85f5c39a3e5b306a10086df595e2c /mesonbuild/build.py
parent7213b7d81fb2cc53d7fdca35409281045bae0fdc (diff)
downloadmeson-d636b92c1adc1588ff11b6ee4972c4bdd686f433.zip
meson-d636b92c1adc1588ff11b6ee4972c4bdd686f433.tar.gz
meson-d636b92c1adc1588ff11b6ee4972c4bdd686f433.tar.bz2
install_*: FileMode doesn't need to be None
There's no reason to allow None into the backend, it already has code to check that all of the values of the FileMode object are None, so let's use that, which is much simpler all the way down.
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r--mesonbuild/build.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 83dd3f0..ee3b9c9 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -135,7 +135,7 @@ class DependencyOverride(HoldableObject):
class Headers(HoldableObject):
def __init__(self, sources: T.List[File], install_subdir: T.Optional[str],
- install_dir: T.Optional[str], install_mode: T.Optional['FileMode'],
+ install_dir: T.Optional[str], install_mode: 'FileMode',
subproject: str):
self.sources = sources
self.install_subdir = install_subdir
@@ -158,14 +158,14 @@ class Headers(HoldableObject):
def get_custom_install_dir(self) -> T.Optional[str]:
return self.custom_install_dir
- def get_custom_install_mode(self) -> T.Optional['FileMode']:
+ def get_custom_install_mode(self) -> 'FileMode':
return self.custom_install_mode
class Man(HoldableObject):
def __init__(self, sources: T.List[File], install_dir: T.Optional[str],
- install_mode: T.Optional['FileMode'], subproject: str,
+ install_mode: 'FileMode', subproject: str,
locale: T.Optional[str]):
self.sources = sources
self.custom_install_dir = install_dir
@@ -176,7 +176,7 @@ class Man(HoldableObject):
def get_custom_install_dir(self) -> T.Optional[str]:
return self.custom_install_dir
- def get_custom_install_mode(self) -> T.Optional['FileMode']:
+ def get_custom_install_mode(self) -> 'FileMode':
return self.custom_install_mode
def get_sources(self) -> T.List['File']:
@@ -186,7 +186,7 @@ class Man(HoldableObject):
class InstallDir(HoldableObject):
def __init__(self, src_subdir: str, inst_subdir: str, install_dir: str,
- install_mode: T.Optional['FileMode'],
+ install_mode: 'FileMode',
exclude: T.Tuple[T.Set[str], T.Set[str]],
strip_directory: bool, subproject: str,
from_source_dir: bool = True):
@@ -2611,7 +2611,7 @@ class ConfigurationData(HoldableObject):
# during install.
class Data(HoldableObject):
def __init__(self, sources: T.List[File], install_dir: str,
- install_mode: T.Optional['FileMode'], subproject: str,
+ install_mode: 'FileMode', subproject: str,
rename: T.List[str] = None):
self.sources = sources
self.install_dir = install_dir