Python codestyle cleanups

Author: solidpixel

lglpy/comms/service_gpu_timeline.py

@@ -165,19 +165,22 @@ def map_renderpass_binding(type, index: int | None) -> str:
     Map the PB encoded render pass attachment type to a description.
     '''
     if type == timeline_pb2.RenderpassAttachmentType.undefined:
-        assert ((index is None) or (index == 0))
+        assert (index is None) or (index == 0)
         return "U"
-    elif type == timeline_pb2.RenderpassAttachmentType.color:
-        assert (index is not None)
+
+    if type == timeline_pb2.RenderpassAttachmentType.color:
+        assert index is not None
         return f"C{index}"
-    elif type == timeline_pb2.RenderpassAttachmentType.depth:
-        assert ((index is None) or (index == 0))
+
+    if type == timeline_pb2.RenderpassAttachmentType.depth:
+        assert (index is None) or (index == 0)
         return "D"
-    elif type == timeline_pb2.RenderpassAttachmentType.stencil:
-        assert ((index is None) or (index == 0))
+
+    if type == timeline_pb2.RenderpassAttachmentType.stencil:
+        assert (index is None) or (index == 0)
         return "S"
-    else:
-        assert False
+
+    assert False
 
 
 def map_image_transfer_type(type) -> str:
@@ -186,16 +189,20 @@ def map_image_transfer_type(type) -> str:
     '''
     if type == timeline_pb2.ImageTransferType.unknown_image_transfer:
         return "Unknown"
-    elif type == timeline_pb2.ImageTransferType.clear_image:
+
+    if type == timeline_pb2.ImageTransferType.clear_image:
         return "Clear image"
-    elif type == timeline_pb2.ImageTransferType.copy_image:
+
+    if type == timeline_pb2.ImageTransferType.copy_image:
         return "Copy image"
-    elif type == timeline_pb2.ImageTransferType.copy_buffer_to_image:
+
+    if type == timeline_pb2.ImageTransferType.copy_buffer_to_image:
         return "Copy buffer to image"
-    elif type == timeline_pb2.ImageTransferType.copy_image_to_buffer:
+
+    if type == timeline_pb2.ImageTransferType.copy_image_to_buffer:
         return "Copy image to buffer"
-    else:
-        assert False
+
+    assert False
 
 
 def map_buffer_transfer_type(type) -> str:
@@ -204,12 +211,14 @@ def map_buffer_transfer_type(type) -> str:
     '''
     if type == timeline_pb2.BufferTransferType.unknown_buffer_transfer:
         return "Unknown"
-    elif type == timeline_pb2.BufferTransferType.fill_buffer:
+
+    if type == timeline_pb2.BufferTransferType.fill_buffer:
         return "Fill buffer"
-    elif type == timeline_pb2.BufferTransferType.copy_buffer:
+
+    if type == timeline_pb2.BufferTransferType.copy_buffer:
         return "Copy buffer"
-    else:
-        assert False
+
+    assert False
 
 
 def map_as_build_type(type) -> str:
@@ -218,29 +227,35 @@ def map_as_build_type(type) -> str:
     '''
     if type == timeline_pb2.AccelerationStructureBuildType.unknown_as_build:
         return "Unknown"
-    elif type == timeline_pb2.AccelerationStructureTransferType.fast_build:
+
+    if type == timeline_pb2.AccelerationStructureTransferType.fast_build:
         return "Fast build"
-    elif type == timeline_pb2.AccelerationStructureTransferType.fast_trace:
+
+    if type == timeline_pb2.AccelerationStructureTransferType.fast_trace:
         return "Fast trace"
-    else:
-        assert False
+
+    assert False
 
 
 def map_as_transfer_type(type) -> str:
     '''
     Map the PB encoded acceleration structure transfer to a description.
     '''
     base_type = timeline_pb2.AccelerationStructureTransferType
+
     if type == base_type.unknown_as_transfer:
         return "Unknown"
-    elif type == base_type.struct_to_struct:
+
+    if type == base_type.struct_to_struct:
         return "Copy acceleration structure"
-    elif type == base_type.struct_to_mem:
+
+    if type == base_type.struct_to_mem:
         return "Copy acceleration structure to mem"
-    elif type == base_type.mem_to_struct:
+
+    if type == base_type.mem_to_struct:
         return "Copy mem to acceleration structure"
-    else:
-        assert False
+
+    assert False
 
 
 def map_debug_label(labels: list[str] | None) -> list[str]:
@@ -249,7 +264,8 @@ def map_debug_label(labels: list[str] | None) -> list[str]:
     '''
     if labels is None:
         return []
-    # need to convert it to a list from a RepeatedScalarContainer
+
+    # Need to convert it to a list from a RepeatedScalarContainer
     return [str(label) for label in labels]
 
 
@@ -292,7 +308,7 @@ def __init__(self, file_path: str, verbose: bool = False):
             file_path: File to write on the filesystem
             verbose: Should this use verbose logging?
         '''
-        self.devices: dict[int, GPUDeviceState] = dict()
+        self.devices: dict[int, GPUDeviceState] = {}
         self.last_submit: SubmitMetadataType | None = None
         self.last_render_pass: RenderpassMetadataType | None = None
         # pylint: disable=consider-using-with

lglpy/timeline/data/processed_trace.py

@@ -61,7 +61,7 @@ class GPUWorkload:
     PARENS = re.compile(r'(\(.*\))')
     RESOLUTION = re.compile(r'\d+x\d+')
     WHITESPACE = re.compile(r'\s\s+')
-    MEMO: dict[str, str] = dict()
+    MEMO: dict[str, str] = {}
 
     @classmethod
     def memoize(cls, string: str) -> str:
@@ -760,7 +760,7 @@ def get_transfer_size_str(self) -> str:
         '''
         # If indirect then show a placeholder
         if self.pixel_count == -1:
-            return f'? pixels'
+            return '? pixels'
 
         s = 's' if self.pixel_count != 1 else ''
         label = f'{self.pixel_count} pixel{s}'
@@ -844,7 +844,7 @@ def get_transfer_size_str(self) -> str:
         '''
         # If indirect then show a placeholder
         if self.byte_count == -1:
-            return f'? bytes'
+            return '? bytes'
 
         s = 's' if self.byte_count != 1 else ''
         label = f'{self.byte_count} byte{s}'
@@ -933,7 +933,7 @@ def get_transfer_size_str(self) -> str:
         '''
         # If indirect then show a placeholder
         if self.primitive_count == -1:
-            return f'? primitives'
+            return '? primitives'
 
         s = 's' if self.primitive_count != 1 else ''
         label = f'{self.primitive_count} primitive{s}'
@@ -1014,7 +1014,7 @@ def get_transfer_size_str(self) -> str:
         '''
         # If indirect then show a placeholder
         if self.byte_count == -1:
-            return f'? bytes'
+            return '? bytes'
 
         s = 's' if self.byte_count != 1 else ''
         label = f'{self.byte_count} byte{s}'

lglpy/timeline/data/raw_trace.py

@@ -300,7 +300,7 @@ class MetadataWorkload:
         label_stack: Debug label stack, or None if no user labels.
     '''
 
-    MEMO: dict[str, str] = dict()
+    MEMO: dict[str, str] = {}
 
     @classmethod
     def memoize(cls, string: str) -> str:

lglpy/timeline/drawable/timeline_base.py

@@ -285,7 +285,7 @@ def remove_multiple_from_active_objects(self, old_objects):
         Args:
             old_objects: the sequence of objects to remove.
         '''
-        removed_objects = {x for x in old_objects}
+        removed_objects = set(old_objects)
         new_active_objects = self.active_objects - removed_objects
 
         # If nothing left then reset the active state
@@ -575,12 +575,12 @@ def on_mouse_single_click(self, button, x, y, mod):
                 return True
 
             # If 'c' modifier then append selection to highlighted region
-            elif mod == 'c':
+            if mod == 'c':
                 self.add_to_active_objects(clicked_object)
                 return True
 
             # If 's' modifier then subtract selection to highlighted region
-            elif mod == 's':
+            if mod == 's':
                 self.remove_from_active_objects(clicked_object)
                 return True