aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2022-09-07 15:12:17 -0700
committerEli Schwartz <eschwartz@archlinux.org>2022-11-30 07:01:22 -0500
commit67da2ad0fb3a0e45bd878d21aa1c5d956214c483 (patch)
treea8ecb74d2368829b241b2a668ed758776d6ff1f4
parent1502431fe9bd06eab4001b0bfc0dd5d9a0d400f0 (diff)
downloadmeson-67da2ad0fb3a0e45bd878d21aa1c5d956214c483.zip
meson-67da2ad0fb3a0e45bd878d21aa1c5d956214c483.tar.gz
meson-67da2ad0fb3a0e45bd878d21aa1c5d956214c483.tar.bz2
pylint: enable simplifiable-if-statement
-rw-r--r--.pylintrc1
-rw-r--r--mesonbuild/build.py5
-rw-r--r--mesonbuild/scripts/depfixer.py6
3 files changed, 2 insertions, 10 deletions
diff --git a/.pylintrc b/.pylintrc
index d4644ef..6d0f70b 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -52,7 +52,6 @@ disable=
redefined-argument-from-local,
redefined-builtin,
redefined-outer-name,
- simplifiable-if-statement,
subprocess-run-check,
super-init-not-called,
too-few-public-methods,
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index a0d0082..426ee26 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -2194,11 +2194,6 @@ class SharedLibrary(BuildTarget):
super().process_kwargs(kwargs)
if not self.environment.machines[self.for_machine].is_android():
- supports_versioning = True
- else:
- supports_versioning = False
-
- if supports_versioning:
# Shared library version
if 'version' in kwargs:
self.ltversion = kwargs['version']
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 31e3f0d..17432c1 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -83,10 +83,8 @@ class DynamicEntry(DataSizes):
class SectionHeader(DataSizes):
def __init__(self, ifile: T.BinaryIO, ptrsize: int, is_le: bool) -> None:
super().__init__(ptrsize, is_le)
- if ptrsize == 64:
- is_64 = True
- else:
- is_64 = False
+ is_64 = ptrsize == 64
+
# Elf64_Word
self.sh_name = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
# Elf64_Word