Format ifcgit code with black

src/blenderbim/blenderbim/bim/module/ifcgit/__init__.py

@@ -15,44 +15,29 @@
 # 2023 Bruno Postle <bruno@postle.net>, Bruno Perdigão <brunoperdigao@tutanota.com>,
 # Massimo Fabbro <maxfb87@yahoo.it>
 
-# import os
-# import sys
 import bpy
 from . import ui, prop, operator
 
-# sys.path.insert(0, "/home/bruno/src/ifc-git")
-# sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
-# bl_info = {
-#         "name": "IFC Git",
-#         "author": "Bruno Postle",
-#         "location": "Scene > IFC Git",
-#         "description": "Manage IFC files in Git repositories",
-#         "blender": (2, 80, 0),
-#         "category": "Import-Export",
-#     }
 
 classes = (
-        operator.AddFileToRepo,
+    operator.AddFileToRepo,
-        operator.CommitChanges,
+    operator.CommitChanges,
-        operator.CreateRepo,
+    operator.CreateRepo,
-        operator.DiscardUncommitted,
+    operator.DiscardUncommitted,
-        operator.DisplayRevision,
+    operator.DisplayRevision,
-        operator.DisplayUncommitted,
+    operator.DisplayUncommitted,
-        operator.Merge,
+    operator.Merge,
-        operator.RefreshGit,
+    operator.RefreshGit,
-        operator.SwitchRevision,
+    operator.SwitchRevision,
-        prop.IfcGitListItem,
+    prop.IfcGitListItem,
-        prop.IfcGitProperties,
+    prop.IfcGitProperties,
-        ui.IFCGIT_PT_panel,
+    ui.IFCGIT_PT_panel,
-        ui.COMMIT_UL_List,
+    ui.COMMIT_UL_List,
-    )
+)
-
-
 
 
 def register():
-        bpy.types.Scene.IfcGitProperties = bpy.props.PointerProperty(type=prop.IfcGitProperties)
+    bpy.types.Scene.IfcGitProperties = bpy.props.PointerProperty(type=prop.IfcGitProperties)
 
 
 def unregister():

src/blenderbim/blenderbim/bim/module/ifcgit/data.py

@@ -1,6 +1,7 @@
 import bpy
 import os
 import shutil
+
 # import tool
 import blenderbim.tool as tool
 

src/blenderbim/blenderbim/bim/module/ifcgit/prop.py

@@ -15,9 +15,7 @@ def git_branches(self, context):
 
     # NOTE "Python must keep a reference to the strings returned by
     # the callback or Blender will misbehave or even crash"
-    IfcGitData.data["branch_names"] = sorted(
+    IfcGitData.data["branch_names"] = sorted([branch.name for branch in IfcGitData.data["repo"].heads])
-        [branch.name for branch in IfcGitData.data["repo"].heads]
-    )
 
     if "main" in IfcGitData.data["branch_names"]:
         IfcGitData.data["branch_names"].remove("main")

src/blenderbim/blenderbim/bim/module/ifcgit/ui.py

@@ -71,9 +71,7 @@ class IFCGIT_PT_panel(bpy.types.Panel):
 
             if IfcGitData.data["repo"].head.is_detached:
                 row = layout.row()
-                row.label(
+                row.label(text="HEAD is detached, commit will create a branch", icon="ERROR")
-                    text="HEAD is detached, commit will create a branch", icon="ERROR"
-                )
                 row.prop(props, "new_branch_name")
 
             row = layout.row()
@@ -83,9 +81,7 @@ class IFCGIT_PT_panel(bpy.types.Panel):
         if IfcGitData.data["repo"].head.is_detached:
             row.label(text="Working branch: Detached HEAD")
         else:
-            row.label(
+            row.label(text="Working branch: " + IfcGitData.data["repo"].active_branch.name)
-                text="Working branch: " + IfcGitData.data["repo"].active_branch.name
-            )
 
         grouped = layout.row()
         column = grouped.column()
@@ -141,9 +137,7 @@ class IFCGIT_PT_panel(bpy.types.Panel):
 class COMMIT_UL_List(bpy.types.UIList):
     """List of Git commits"""
 
-    def draw_item(
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        self, context, layout, data, item, icon, active_data, active_propname, index
-    ):
 
         props = context.scene.IfcGitProperties
 
@@ -166,9 +160,7 @@ class COMMIT_UL_List(bpy.types.UIList):
                 refs += "{" + tag.name + "} "
 
         if commit == current_revision:
-            layout.label(
+            layout.label(text="[HEAD] " + refs + commit.message, icon="DECORATE_KEYFRAME")
-                text="[HEAD] " + refs + commit.message, icon="DECORATE_KEYFRAME"
-            )
         else:
             layout.label(text=refs + commit.message, icon="DECORATE_ANIMATE")
         layout.label(text=time.strftime("%c", time.localtime(commit.committed_date)))

src/blenderbim/blenderbim/tool/ifcgit.py

@@ -47,9 +47,7 @@ class IfcGit:
     @classmethod
     def add_file_to_repo(cls, repo, path_file):
         repo.index.add(path_file)
-        repo.index.commit(
+        repo.index.commit(message="Added " + os.path.relpath(path_file, repo.working_dir))
-            message="Added " + os.path.relpath(path_file, repo.working_dir)
-        )
         bpy.ops.ifcgit.refresh()
 
     @classmethod
@@ -63,7 +61,6 @@ class IfcGit:
         repo.index.add(path_file)
         repo.index.commit(message=props.commit_message)
         props.commit_message = ""
-        return repo
 
     @classmethod
     def create_new_branch(cls):
@@ -209,9 +206,7 @@ class IfcGit:
         current_revision = repo.commit()
 
         if selected_revision == current_revision:
-            area = next(
+            area = next(area for area in bpy.context.screen.areas if area.type == "VIEW_3D")
-                area for area in bpy.context.screen.areas if area.type == "VIEW_3D"
-            )
             area.spaces[0].shading.color_type = "MATERIAL"
             return
 
@@ -249,9 +244,7 @@ class IfcGit:
         final_step_ids = {}
         final_step_ids["added"] = step_ids["added"]
         final_step_ids["removed"] = step_ids["removed"]
-        final_step_ids["modified"] = step_ids["modified"].union(
+        final_step_ids["modified"] = step_ids["modified"].union(modified_shape_object_step_ids["modified"])
-            modified_shape_object_step_ids["modified"]
-        )
         return final_step_ids
 
     @classmethod
@@ -311,9 +304,7 @@ class IfcGit:
         section = 'mergetool "ifcmerge"'
         if not config_reader.has_section(section):
             config_writer = IfcGitRepo.repo.config_writer()
-            config_writer.set_value(
+            config_writer.set_value(section, "cmd", "ifcmerge $BASE $LOCAL $REMOTE $MERGED")
-                section, "cmd", "ifcmerge $BASE $LOCAL $REMOTE $MERGED"
-            )
             config_writer.set_value(section, "trustExitCode", True)
 
     @classmethod