griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: scripts under scripts/startup/ to use str.format

Browse Source 
Part of modernizing scripts in Blender, where the previous convention
was to use percentage formatting which has become the "old" way to
format strings in Python.

See proposal for details #120453.

Ref !120552
This commit is contained in:
Campbell Barton
2024-04-27 16:02:36 +10:00
parent 9a40c62863
commit 0e3b594edb
37 changed files with 333 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/startup/bl_operators/file.py
View File

@@ -125,7 +125,7 @@ class WM_OT_previews_batch_generate(Operator):
if not self.use_backups:
cmd.append("--no_backups")
if subprocess.call(cmd):
self.report({'ERROR'}, rpt_("Previews generation process failed for file '%s'!") % blen_path)
self.report({'ERROR'}, rpt_("Previews generation process failed for file '{!s}'!").format(blen_path))
context.window_manager.progress_end()
return {'CANCELLED'}
context.window_manager.progress_update(i + 1)
@@ -235,7 +235,7 @@ class WM_OT_previews_batch_clear(Operator):
if not self.use_backups:
cmd.append("--no_backups")
if subprocess.call(cmd):
self.report({'ERROR'}, rpt_("Previews clear process failed for file '%s'!") % blen_path)
self.report({'ERROR'}, rpt_("Previews clear process failed for file '{!s}'!").format(blen_path))
context.window_manager.progress_end()
return {'CANCELLED'}
context.window_manager.progress_update(i + 1)
@@ -273,8 +273,9 @@ class WM_OT_blend_strings_utf8_validate(Operator):
val_utf8 = val_bytes.decode("utf-8", "replace")
val_bytes_valid = val_utf8.encode("utf-8")
if val_bytes_valid != val_bytes:
print("found bad utf8 encoded string %r, fixing to %r (%r)..."
"" % (val_bytes, val_bytes_valid, val_utf8))
print("found bad utf8 encoded string {!r}, fixing to {!r} ({!r})...".format(
val_bytes, val_bytes_valid, val_utf8,
))
setattr(item, prop.identifier, val_utf8)
changed = True
elif prop.type == 'POINTER':