From 1c0287441a0d3bc3aabdcc34f6b11e4605694973 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 4 Jan 2021 11:22:26 +1100
Subject: [PATCH] Cleanup: comparisons with None
---
utils/blender_merge_format_changes.py | 2 +-
utils/cycles_timeit.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/blender_merge_format_changes.py b/utils/blender_merge_format_changes.py
index 4227b8b..e0e4632 100755
--- a/utils/blender_merge_format_changes.py
+++ b/utils/blender_merge_format_changes.py
@@ -32,7 +32,7 @@ if len(sys.argv) >= 2:
if sys.argv[2] == '--base_branch':
base_branch = sys.argv[3]
-if mode == None:
+if mode is None:
print("Merge or rebase Blender master (or another base branch) into a branch in 3 steps,")
print("to automatically merge clang-format changes.")
print("")
diff --git a/utils/cycles_timeit.py b/utils/cycles_timeit.py
index 43e7bed..2ac2d49 100755
--- a/utils/cycles_timeit.py
+++ b/utils/cycles_timeit.py
@@ -149,7 +149,7 @@ def benchmarkFile(blender, blendfile, stats):
pipeline_render_time = "N/A"
while True:
line = process.stdout.readline()
- if line == b"" and process.poll() != None:
+ if line == b"" and process.poll() is not None:
break
line = line.decode().strip()
if line == "":
--
GitLab