[Bf-blender-cvs] [597122d72b6] master: Cleanup: use f-strings
Campbell Barton
noreply at git.blender.org
Thu Jun 28 08:44:18 CEST 2018
Commit: 597122d72b691ac6522b5ee2acd26e2b4b1135a5
Author: Campbell Barton
Date: Thu Jun 28 08:30:54 2018 +0200
Branches: master
https://developer.blender.org/rB597122d72b691ac6522b5ee2acd26e2b4b1135a5
Cleanup: use f-strings
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/properties_render.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_text.py
M release/scripts/startup/bl_ui/space_userpref.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 290b08342be..a147950a36d 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -990,7 +990,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
render = max(scene.cycles.dicing_rate * ob.cycles.dicing_rate, 0.1)
preview = max(scene.cycles.preview_dicing_rate * ob.cycles.dicing_rate, 0.1)
- col.label("Render %.2f px, Preview %.2f px" % (render, preview))
+ col.label(f"Render {render:10.2f} px, Preview {preview:10.2f} px")
def SURFACE(self, layout, ob, md):
layout.label(text="Settings are inside the Physics tab")
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index a5ce345a93c..bd5d926d4cd 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -101,10 +101,10 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel):
custom_framerate = (fps_rate not in {23.98, 24, 25, 29.97, 30, 50, 59.94, 60})
if custom_framerate is True:
- fps_label_text = "Custom (%r fps)" % fps_rate
+ fps_label_text = f"Custom ({fps_rate!r} fps)"
show_framerate = True
else:
- fps_label_text = "%r fps" % fps_rate
+ fps_label_text = f"{fps_rate!r} fps"
show_framerate = (preset_label == "Custom")
RENDER_PT_dimensions._frame_rate_args_prev = args
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 9cbb27bcedb..9a2215969cf 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -104,7 +104,11 @@ class IMAGE_MT_view(Menu):
ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
for a, b in ratios:
- layout.operator("image.view_zoom_ratio", text=iface_("Zoom %d:%d") % (a, b), translate=False).ratio = a / b
+ layout.operator(
+ "image.view_zoom_ratio",
+ text=iface_(f"Zoom {a:d}:{b:d}"),
+ translate=False,
+ ).ratio = a / b
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 0697cf8e56b..d156f822606 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -708,11 +708,11 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
if i == strip.multicam_source:
sub = row.row(align=True)
sub.enabled = False
- sub.operator("sequencer.cut_multicam", text="%d" % i).camera = i
+ sub.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i
else:
sub_1 = row.row(align=True)
sub_1.enabled = True
- sub_1.operator("sequencer.cut_multicam", text="%d" % i).camera = i
+ sub_1.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i
if strip.channel > BT_ROW and (strip_channel - 1) % BT_ROW:
for i in range(strip.channel, strip_channel + ((BT_ROW + 1 - strip_channel) % BT_ROW)):
diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index 98a7da855ca..d0067012ffe 100644
--- a/release/scripts/startup/bl_ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -50,9 +50,9 @@ class TEXT_HT_header(Header):
row.prop(st, "show_syntax_highlight", text="")
if text:
- osl = text.name.endswith(".osl") or text.name.endswith(".oso")
+ is_osl = text.name.endswith((".osl", ".osl"))
- if osl:
+ if is_osl:
row = layout.row()
row.operator("node.shader_script_update")
else:
@@ -66,15 +66,21 @@ class TEXT_HT_header(Header):
row = layout.row()
if text.filepath:
if text.is_dirty:
- row.label(text=iface_("File: *%r (unsaved)") %
- text.filepath, translate=False)
+ row.label(
+ iface_(f"File: *{text.filepath} (unsaved)"),
+ translate=False,
+ )
else:
- row.label(text=iface_("File: %r") %
- text.filepath, translate=False)
+ row.label(
+ iface_(f"File: {text.filepath}"),
+ translate=False,
+ )
else:
- row.label(text="Text: External"
- if text.library
- else "Text: Internal")
+ row.label(
+ "Text: External"
+ if text.library
+ else "Text: Internal"
+ )
class TEXT_MT_editor_menus(Menu):
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index b7d425bbc6f..d79239d8527 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -940,7 +940,7 @@ class USERPREF_PT_theme(Panel):
col = split.column()
for i, ui in enumerate(theme.bone_color_sets, 1):
- col.label(text=iface_("Color Set %d:") % i, translate=False)
+ col.label(iface_(f"Color Set {i:d}"), translate=False)
row = col.row()
More information about the Bf-blender-cvs
mailing list