From ec40ad0b3f17e458a765c450a5e56888e8660fc1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Fri, 31 Jan 2025 13:20:53 +1100
Subject: [PATCH] Cleanup: use str.format to format strings in Python

---
 scripts/freestyle/modules/freestyle/utils.py         | 2 +-
 scripts/modules/bl_i18n_utils/bl_extract_messages.py | 2 +-
 scripts/modules/bl_i18n_utils/utils.py               | 9 +++++----
 scripts/modules/bl_i18n_utils/utils_cli.py           | 2 +-
 scripts/startup/bl_operators/node.py                 | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/freestyle/modules/freestyle/utils.py b/scripts/freestyle/modules/freestyle/utils.py
index 92541a2cd8e..df5cf5be5e3 100644
--- a/scripts/freestyle/modules/freestyle/utils.py
+++ b/scripts/freestyle/modules/freestyle/utils.py
@@ -283,7 +283,7 @@ class BoundingBox:
         self.corners = (minimum, maximum)
 
     def __repr__(self):
-        return "BoundingBox(%r, %r)" % (self.minimum, self.maximum)
+        return "BoundingBox({!r}, {!r})".format(self.minimum, self.maximum)
 
     @classmethod
     def from_sequence(cls, sequence):
diff --git a/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/scripts/modules/bl_i18n_utils/bl_extract_messages.py
index 0aa7fcfb1b8..d171022a6b5 100644
--- a/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -696,7 +696,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings):
         for node in ast.walk(root_node):
             if type(node) == ast.Call:
                 # ~ print("found function at")
-                # ~ print("%s:%d" % (fp, node.lineno))
+                # ~ print("{:s}:{:d}".format(fp, node.lineno))
 
                 # We can't skip such situations! from blah import foo\nfoo("bar") would also be an ast.Name func!
                 if type(node.func) == ast.Name:
diff --git a/scripts/modules/bl_i18n_utils/utils.py b/scripts/modules/bl_i18n_utils/utils.py
index de7907ad185..591ab2c55f9 100644
--- a/scripts/modules/bl_i18n_utils/utils.py
+++ b/scripts/modules/bl_i18n_utils/utils.py
@@ -75,10 +75,11 @@ def locale_explode(locale):
     m = _locale_explode_re.match(locale)
     if m:
         lang, country, variant = m.groups()
-        return (lang, country, variant,
-                "%s_%s" % (lang, country) if country else None,
-                "%s@%s" % (lang, variant) if variant else None)
-
+        return (
+            lang, country, variant,
+            "{:s}_{:s}".format(lang, country) if country else None,
+            "{:s}@{:s}".format(lang, variant) if variant else None
+        )
     try:
         import bpy.app.translations as bpy_translations
         assert ret == bpy_translations.locale_explode(locale)
diff --git a/scripts/modules/bl_i18n_utils/utils_cli.py b/scripts/modules/bl_i18n_utils/utils_cli.py
index b9b1d2a177f..0b749b1a069 100644
--- a/scripts/modules/bl_i18n_utils/utils_cli.py
+++ b/scripts/modules/bl_i18n_utils/utils_cli.py
@@ -71,7 +71,7 @@ def language_menu(args, settings):
             continue
         for po_path in os.listdir(po_dir):
             uid = po_to_uid.get(po_path, None)
-            # print("Checking %s, found uid %s" % (po_path, uid))
+            # print("Checking {:s}, found uid {:s}".format(po_path, uid))
             po_path = os.path.join(po_dir, po_path)
             if uid is not None:
                 po = utils_i18n.I18nMessages(uid=uid, kind='PO', src=po_path, settings=settings)
diff --git a/scripts/startup/bl_operators/node.py b/scripts/startup/bl_operators/node.py
index c0673f27e53..f40e159a686 100644
--- a/scripts/startup/bl_operators/node.py
+++ b/scripts/startup/bl_operators/node.py
@@ -475,7 +475,7 @@ class NODE_OT_viewer_shortcut_set(Operator):
             nodes.active = old_active
 
         viewer_node.ui_shortcut = self.viewer_index
-        self.report({'INFO'}, "Assigned shortcut %i to %s" % (self.viewer_index, viewer_node.name))
+        self.report({'INFO'}, "Assigned shortcut {:d} to {:s}".format(self.viewer_index, viewer_node.name))
 
         return {'FINISHED'}
 
@@ -510,7 +510,7 @@ class NODE_OT_viewer_shortcut_get(Operator):
                 viewer_node = n
 
         if not viewer_node:
-            self.report({'INFO'}, "Shortcut %i is not assigned to a Viewer node yet" % self.viewer_index)
+            self.report({'INFO'}, "Shortcut {:d} is not assigned to a Viewer node yet".format(self.viewer_index))
             return {'CANCELLED'}
 
         # Use the node active status to enable this viewer node and disable others.