[Lldb-commits] [lldb] [lldb] fix(lldb/**.py): fix comparison to True/False (PR #94039)
Eisuke Kawashima via lldb-commits
lldb-commits at lists.llvm.org
Sun Jun 9 15:56:58 PDT 2024
https://github.com/e-kwsm updated https://github.com/llvm/llvm-project/pull/94039
>From c586cd2b0d38195dc7fc88f6290482bba72b8d4f Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima <e-kwsm at users.noreply.github.com>
Date: Sun, 12 May 2024 00:06:53 +0900
Subject: [PATCH] fix(lldb/**.py): fix comparison to True/False
from PEP8 (https://peps.python.org/pep-0008/#programming-recommendations):
> Comparisons to singletons like None should always be done with is or
> is not, never the equality operators.
---
lldb/examples/python/crashlog.py | 2 +-
lldb/examples/python/disasm-stress-test.py | 4 ++--
lldb/examples/summaries/cocoa/CFString.py | 6 +++---
lldb/examples/summaries/pysummary.py | 2 +-
lldb/examples/synthetic/bitfield/example.py | 2 +-
lldb/packages/Python/lldbsuite/test/lldbtest.py | 2 +-
lldb/test/API/commands/command/script/welcome.py | 2 +-
.../commands/expression/call-throws/TestCallThatThrows.py | 6 +++---
.../disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py | 2 +-
.../gdb_remote_client/TestNoWatchpointSupportInfo.py | 2 +-
lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py | 2 +-
lldb/test/API/tools/lldb-server/TestLldbGdbServer.py | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py
index 1c0d717ce455c..368437ed63e46 100755
--- a/lldb/examples/python/crashlog.py
+++ b/lldb/examples/python/crashlog.py
@@ -166,7 +166,7 @@ def dump_symbolicated(self, crash_log, options):
this_thread_crashed = self.app_specific_backtrace
if not this_thread_crashed:
this_thread_crashed = self.did_crash()
- if options.crashed_only and this_thread_crashed == False:
+ if options.crashed_only and not this_thread_crashed:
return
print("%s" % self)
diff --git a/lldb/examples/python/disasm-stress-test.py b/lldb/examples/python/disasm-stress-test.py
index 2d3314ee8e8ff..62b2b90a2860a 100755
--- a/lldb/examples/python/disasm-stress-test.py
+++ b/lldb/examples/python/disasm-stress-test.py
@@ -95,13 +95,13 @@ def GetLLDBFrameworkPath():
debugger = lldb.SBDebugger.Create()
-if debugger.IsValid() == False:
+if not debugger.IsValid():
print("Couldn't create an SBDebugger")
sys.exit(-1)
target = debugger.CreateTargetWithFileAndArch(None, arg_ns.arch)
-if target.IsValid() == False:
+if not target.IsValid():
print("Couldn't create an SBTarget for architecture " + arg_ns.arch)
sys.exit(-1)
diff --git a/lldb/examples/summaries/cocoa/CFString.py b/lldb/examples/summaries/cocoa/CFString.py
index 13c294ca34122..74bd927e9db21 100644
--- a/lldb/examples/summaries/cocoa/CFString.py
+++ b/lldb/examples/summaries/cocoa/CFString.py
@@ -253,9 +253,9 @@ def get_child_at_index(self, index):
elif (
self.inline
and self.explicit
- and self.unicode == False
- and self.special == False
- and self.mutable == False
+ and not self.unicode
+ and not self.special
+ and not self.mutable
):
return self.handle_inline_explicit()
elif self.unicode:
diff --git a/lldb/examples/summaries/pysummary.py b/lldb/examples/summaries/pysummary.py
index e63a0bff56a13..2a05c1cbf8f28 100644
--- a/lldb/examples/summaries/pysummary.py
+++ b/lldb/examples/summaries/pysummary.py
@@ -2,7 +2,7 @@
def pyobj_summary(value, unused):
- if value is None or value.IsValid() == False or value.GetValueAsUnsigned(0) == 0:
+ if value is None or not value.IsValid() or value.GetValueAsUnsigned(0) == 0:
return "<invalid>"
refcnt = value.GetChildMemberWithName("ob_refcnt")
expr = "(char*)PyString_AsString( (PyObject*)PyObject_Str( (PyObject*)0x%x) )" % (
diff --git a/lldb/examples/synthetic/bitfield/example.py b/lldb/examples/synthetic/bitfield/example.py
index 2f58123268aa1..45416477bfef2 100644
--- a/lldb/examples/synthetic/bitfield/example.py
+++ b/lldb/examples/synthetic/bitfield/example.py
@@ -51,7 +51,7 @@ def get_child_at_index(self, index):
return None
if index > self.num_children():
return None
- if self.valobj.IsValid() == False:
+ if not self.valobj.IsValid():
return None
if index == 0:
return self.valobj.GetChildMemberWithName("value")
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 1ad8ab6e6e462..1854f6c2c2e7b 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -2446,7 +2446,7 @@ def found_str(matched):
log_lines.append(pattern_line)
# Convert to bool because match objects
- # are True-ish but != True itself
+ # are True-ish but is not True itself
matched = bool(matched)
if matched != matching:
break
diff --git a/lldb/test/API/commands/command/script/welcome.py b/lldb/test/API/commands/command/script/welcome.py
index c1ae0063a52a9..7b7578d6df46d 100644
--- a/lldb/test/API/commands/command/script/welcome.py
+++ b/lldb/test/API/commands/command/script/welcome.py
@@ -45,7 +45,7 @@ def print_wait_impl(debugger, args, result, dict):
def check_for_synchro(debugger, args, result, dict):
if debugger.GetAsync():
print("I am running async", file=result)
- if debugger.GetAsync() == False:
+ if not debugger.GetAsync():
print("I am running sync", file=result)
diff --git a/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py b/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py
index b8cc87c93ba61..0090513864cd7 100644
--- a/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py
+++ b/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py
@@ -61,7 +61,7 @@ def call_function(self):
value = frame.EvaluateExpression("[my_class callMeIThrow]", options)
- self.assertTrue(value.IsValid() and value.GetError().Success() == False)
+ self.assertTrue(value.IsValid() and not value.GetError().Success())
self.check_after_call()
# Now set the ObjC language breakpoint and make sure that doesn't
@@ -76,7 +76,7 @@ def call_function(self):
value = frame.EvaluateExpression("[my_class callMeIThrow]", options)
- self.assertTrue(value.IsValid() and value.GetError().Success() == False)
+ self.assertTrue(value.IsValid() and not value.GetError().Success())
self.check_after_call()
# Now turn off exception trapping, and call a function that catches the exceptions,
@@ -95,5 +95,5 @@ def call_function(self):
options.SetUnwindOnError(False)
value = frame.EvaluateExpression("[my_class callMeIThrow]", options)
- self.assertTrue(value.IsValid() and value.GetError().Success() == False)
+ self.assertTrue(value.IsValid() and not value.GetError().Success())
self.check_after_call()
diff --git a/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py b/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py
index da9ce1b87d333..8a3bcf28a2115 100644
--- a/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py
+++ b/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py
@@ -57,7 +57,7 @@ def disassemble_check_for_hi_and_foo(self, target, func, binaryname):
found_hi_string = True
if "foo" in i.GetComment(target):
found_foo = True
- if found_hi_string == False or found_foo == False:
+ if not found_hi_string or not found_foo:
print(
'Did not find "HI" string or "foo" in disassembly symbolication in %s'
% binaryname
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
index a51b228e917cc..7d6b1afd94a18 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
@@ -61,7 +61,7 @@ def qXferRead(self, obj, annex, offset, length):
wp_opts = lldb.SBWatchpointOptions()
wp_opts.SetWatchpointTypeWrite(lldb.eWatchpointWriteTypeOnModify)
wp = target.WatchpointCreateByAddress(0x100, 8, wp_opts, err)
- if self.TraceOn() and (err.Fail() or wp.IsValid == False):
+ if self.TraceOn() and (err.Fail() or not wp.IsValid):
strm = lldb.SBStream()
err.GetDescription(strm)
print("watchpoint failed: %s" % strm.GetData())
diff --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
index d770447f0771c..b01be05354e73 100644
--- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
+++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
@@ -39,7 +39,7 @@ def check_simulator_ostype(self, sdk, platform_name, arch=platform.machine()):
for device in devices:
if "availability" in device and device["availability"] != "(available)":
continue
- if "isAvailable" in device and device["isAvailable"] != True:
+ if "isAvailable" in device and not device["isAvailable"]:
continue
if deviceRuntime and runtime < deviceRuntime:
continue
diff --git a/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
index 32b36bc04c1a3..93485cd32f519 100644
--- a/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
@@ -953,7 +953,7 @@ def breakpoint_set_and_remove_work(self, want_hardware):
z_packet_type = 0
# If hardware breakpoint is requested set packet type to Z1
- if want_hardware == True:
+ if want_hardware:
z_packet_type = 1
self.reset_test_sequence()
More information about the lldb-commits
mailing list