From 333433057ea2728f1646a20ee602b72c40e5c1ba Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 3 Jan 2024 21:48:38 +0800
Subject: [PATCH] cosmetic tweaks regarding to Ondrej's comment

---
 openpype/hosts/max/api/lib_rendersettings.py      | 15 ++++++---------
 .../plugins/publish/save_scenes_for_cameras.py    |  7 +++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py
index 166076f008..be50e296eb 100644
--- a/openpype/hosts/max/api/lib_rendersettings.py
+++ b/openpype/hosts/max/api/lib_rendersettings.py
@@ -80,7 +80,7 @@ class RenderSettings(object):
             )]
         except KeyError:
             aov_separator = "."
-        output_filename = "{0}..{1}".format(output, img_fmt)
+        output_filename = f"{output}..{img_fmt}"
         output_filename = output_filename.replace("{aov_separator}",
                                                   aov_separator)
         rt.rendOutputFilename = output_filename
@@ -146,13 +146,13 @@ class RenderSettings(object):
         for i in range(render_elem_num):
             renderlayer_name = render_elem.GetRenderElement(i)
             target, renderpass = str(renderlayer_name).split(":")
-            aov_name = "{0}_{1}..{2}".format(dir, renderpass, ext)
+            aov_name = f"{dir}_{renderpass}..{ext}"
             render_elem.SetRenderElementFileName(i, aov_name)
 
     def get_render_output(self, container, output_dir):
         output = os.path.join(output_dir, container)
         img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"]   # noqa
-        output_filename = "{0}..{1}".format(output, img_fmt)
+        output_filename = f"{output}..{img_fmt}"
         return output_filename
 
     def get_render_element(self):
@@ -181,8 +181,7 @@ class RenderSettings(object):
         for i in range(render_elem_num):
             renderlayer_name = render_elem.GetRenderElement(i)
             target, renderpass = str(renderlayer_name).split(":")
-            aov_name = "{0}_{1}_{2}..{3}".format(
-                output, camera, renderpass, img_fmt)
+            aov_name = f"{output}_{camera}_{renderpass}..{img_fmt}"
             render_element_list.append(aov_name)
         return render_element_list
 
@@ -205,8 +204,7 @@ class RenderSettings(object):
         for i in range(render_elem_num):
             renderlayer_name = render_elem.GetRenderElement(i)
             target, renderpass = str(renderlayer_name).split(":")
-            aov_name = "{0}_{1}_{2}..{3}".format(
-                directory, camera, renderpass, ext)
+            aov_name = f"{directory}_{camera}_{renderpass}..{ext}"
             render_elem.SetRenderElementFileName(i, aov_name)
 
     def batch_render_layer(self, container,
@@ -224,7 +222,6 @@ class RenderSettings(object):
                 renderlayer = rt.batchRenderMgr.GetView(layer_no)
             # use camera name as renderlayer name
             renderlayer.name = cam
-            renderlayer.outputFilename = "{0}_{1}..{2}".format(
-                output, cam, img_fmt)
+            renderlayer.outputFilename = f"{output}_{cam}..{img_fmt}"
             outputs.append(renderlayer.outputFilename)
         return outputs
diff --git a/openpype/hosts/max/plugins/publish/save_scenes_for_cameras.py b/openpype/hosts/max/plugins/publish/save_scenes_for_cameras.py
index 79e9088ac7..c39109417b 100644
--- a/openpype/hosts/max/plugins/publish/save_scenes_for_cameras.py
+++ b/openpype/hosts/max/plugins/publish/save_scenes_for_cameras.py
@@ -31,13 +31,12 @@ class SaveScenesForCamera(pyblish.api.InstancePlugin):
         cameras = instance.data.get("cameras")
         if not cameras:
             return
-        new_folder = "{}_{}".format(current_folder, filename)
+        new_folder = f"{current_folder}_{filename}"
         os.makedirs(new_folder, exist_ok=True)
         for camera in cameras:
             new_output = RenderSettings().get_batch_render_output(camera)       # noqa
             new_output = new_output.replace("\\", "/")
-            new_filename = "{}_{}{}".format(
-                filename, camera, ext)
+            new_filename = f"{filename}_{camera}{ext}"
             new_filepath = os.path.join(new_folder, new_filename)
             new_filepath = new_filepath.replace("\\", "/")
             camera_scene_files.append(new_filepath)
@@ -61,7 +60,7 @@ if render_elem_num > 0:
     for i in range(render_elem_num):
         renderlayer_name = render_elem.GetRenderElement(i)
         target, renderpass = str(renderlayer_name).split(":")
-        aov_name = directory + "_" + camera + "_" + renderpass + "." + "." + ext        # noqa
+        aov_name =  f"{{directory}}_{camera}_{{renderpass}}..{ext}"
         render_elem.SetRenderElementFileName(i, aov_name)
 rt.saveMaxFile(new_filepath)
         """).format(filename=instance.name,