[Bf-blender-cvs] [c516659b5e2] blender-v3.0-release: Cleanup: use static sets

Campbell Barton noreply at git.blender.org
Mon Nov 8 04:53:04 CET 2021


Commit: c516659b5e2bb118a5d9f28d49477d2ac1f24b08
Author: Campbell Barton
Date:   Mon Nov 8 14:26:48 2021 +1100
Branches: blender-v3.0-release
https://developer.blender.org/rBc516659b5e2bb118a5d9f28d49477d2ac1f24b08

Cleanup: use static sets

===================================================================

M	build_files/cmake/clang_array_check.py
M	release/scripts/startup/bl_ui/properties_paint_common.py
M	tests/performance/api/config.py
M	tests/performance/api/graph.py
M	tests/python/modules/mesh_test.py

===================================================================

diff --git a/build_files/cmake/clang_array_check.py b/build_files/cmake/clang_array_check.py
index 09ff4f413db..63f86b5aab7 100644
--- a/build_files/cmake/clang_array_check.py
+++ b/build_files/cmake/clang_array_check.py
@@ -168,7 +168,7 @@ def function_parm_wash_tokens(parm):
     # if tokens[-1].kind == To
     # remove trailing char
     if tokens[-1].kind == TokenKind.PUNCTUATION:
-        if tokens[-1].spelling in (",", ")", ";"):
+        if tokens[-1].spelling in {",", ")", ";"}:
             tokens.pop()
         # else:
         #     print(tokens[-1].spelling)
@@ -179,7 +179,7 @@ def function_parm_wash_tokens(parm):
         t_spelling = t.spelling
         ok = True
         if t_kind == TokenKind.KEYWORD:
-            if t_spelling in ("const", "restrict", "volatile"):
+            if t_spelling in {"const", "restrict", "volatile"}:
                 ok = False
             elif t_spelling.startswith("__"):
                 ok = False  # __restrict
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 14aacf3a47a..49effabc5cf 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -496,7 +496,7 @@ class DisplayPanel(BrushPanel):
             icon='HIDE_OFF' if brush.use_cursor_overlay else 'HIDE_ON',
         )
 
-        if mode in ['PAINT_2D', 'PAINT_TEXTURE', 'PAINT_VERTEX', 'SCULPT']:
+        if mode in {'PAINT_2D', 'PAINT_TEXTURE', 'PAINT_VERTEX', 'SCULPT'}:
             row = col.row(align=True)
             row.prop(brush, "texture_overlay_alpha", text="Texture Opacity")
             row.prop(brush, "use_primary_overlay_override", toggle=True, text="", icon='BRUSH_DATA')
@@ -506,7 +506,7 @@ class DisplayPanel(BrushPanel):
                     icon='HIDE_OFF' if brush.use_primary_overlay else 'HIDE_ON',
                 )
 
-        if mode in ['PAINT_TEXTURE', 'PAINT_2D']:
+        if mode in {'PAINT_TEXTURE', 'PAINT_2D'}:
             row = col.row(align=True)
             row.prop(brush, "mask_overlay_alpha", text="Mask Texture Opacity")
             row.prop(brush, "use_secondary_overlay_override", toggle=True, text="", icon='BRUSH_DATA')
diff --git a/tests/performance/api/config.py b/tests/performance/api/config.py
index b5e2b390aa3..5e7ee380068 100644
--- a/tests/performance/api/config.py
+++ b/tests/performance/api/config.py
@@ -206,7 +206,7 @@ class TestConfig:
         # Optimization to avoid rebuilds.
         revisions_to_build = set()
         for entry in entries:
-            if entry.status in ('queued', 'outdated'):
+            if entry.status in {'queued', 'outdated'}:
                 revisions_to_build.add(entry.git_hash)
         self.queue.has_multiple_revisions_to_build = len(revisions_to_build) > 1
 
@@ -260,7 +260,7 @@ class TestConfig:
                         entry.executable = executable
                         entry.benchmark_type = self.benchmark_type
                         entry.date = date
-                        if entry.status in ('done', 'failed'):
+                        if entry.status in {'done', 'failed'}:
                             entry.status = 'outdated'
                 else:
                     # Add new entry if it did not exist yet.
diff --git a/tests/performance/api/graph.py b/tests/performance/api/graph.py
index c7d3c5043ec..b04cd367449 100644
--- a/tests/performance/api/graph.py
+++ b/tests/performance/api/graph.py
@@ -21,7 +21,7 @@ class TestGraph:
             queue = TestQueue(json_filepath)
 
             for entry in queue.entries:
-                if entry.status in ('done', 'outdated'):
+                if entry.status in {'done', 'outdated'}:
                     device_name = entry.device_name + " (" + entry.device_type + ")"
                     if device_name in devices.keys():
                         devices[device_name].append(entry)
diff --git a/tests/python/modules/mesh_test.py b/tests/python/modules/mesh_test.py
index 4cf545d3292..3cee4d88498 100644
--- a/tests/python/modules/mesh_test.py
+++ b/tests/python/modules/mesh_test.py
@@ -113,7 +113,7 @@ class OperatorSpecEditMode:
         """
         self.operator_name = operator_name
         self.operator_parameters = operator_parameters
-        if select_mode not in ['VERT', 'EDGE', 'FACE']:
+        if select_mode not in {'VERT', 'EDGE', 'FACE'}:
             raise ValueError("select_mode must be either {}, {} or {}".format('VERT', 'EDGE', 'FACE'))
         self.select_mode = select_mode
         self.selection = selection



More information about the Bf-blender-cvs mailing list