diff --git a/utils/blender_merge_format_changes.py b/utils/blender_merge_format_changes.py index 4227b8b3401ab45b97ff29e7bcd36fb6ee377e52..e0e46320779617ca66979b3f2e8dbde0c6b745cb 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 43e7bedb1497d3ebffed0523765bede8856b0ad6..2ac2d49eee15711a109eccab444e31f2631887e7 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 == "":