From 646ef49e197d14e7717547a3f9ed119f5a79e2a8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 26 Jun 2020 12:30:03 +1000 Subject: Cleanup: use percentage formatting `str.format` and `f-string` use was minimal. Prefer using a single style of string formatting unless an alternative is more widely adopted. --- release/datafiles/blender_icons_geom_update.py | 4 ++-- release/scripts/modules/addon_utils.py | 21 +++++++++++---------- .../modules/bl_previews_utils/bl_previews_render.py | 4 ++-- .../scripts/modules/bl_ui_utils/bug_report_url.py | 6 +++--- release/scripts/modules/bpy/ops.py | 2 +- release/scripts/modules/bpy/utils/previews.py | 7 ++++--- release/scripts/startup/bl_operators/sequencer.py | 4 ++-- release/scripts/startup/bl_operators/wm.py | 10 +++++----- release/scripts/startup/bl_ui/space_sequencer.py | 4 ++-- .../startup/bl_ui/space_toolsystem_common.py | 2 +- .../startup/bl_ui/space_toolsystem_toolbar.py | 6 +++--- release/scripts/startup/bl_ui/space_userpref.py | 10 ++++++---- release/scripts/startup/bl_ui/space_view3d.py | 4 ++-- 13 files changed, 44 insertions(+), 40 deletions(-) (limited to 'release') diff --git a/release/datafiles/blender_icons_geom_update.py b/release/datafiles/blender_icons_geom_update.py index 3b7724756db..5b95961ae6b 100755 --- a/release/datafiles/blender_icons_geom_update.py +++ b/release/datafiles/blender_icons_geom_update.py @@ -21,10 +21,10 @@ def edit_text_file(filename, marker_begin, marker_end, content): while data[marker_end_index - 1] in {'\t', ' '}: marker_end_index -= 1 if marker_begin_index == -1: - print('Error: {!r} not found'.format(marker_begin)) + print('Error: %r not found' % marker_begin) return if marker_end_index == -1: - print('Error: {!r} not found'.format(marker_end)) + print('Error: %r not found' % marker_end) return marker_begin_index += len(marker_begin) + 1 data_update = data[:marker_begin_index] + content + data[marker_end_index:] diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index a65ff15393a..8a074d23db9 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -172,8 +172,8 @@ def modules_refresh(module_cache=addons_fake_modules): if mod.__file__ != mod_path: print( "multiple addons with the same name:\n" - " " f"{mod.__file__!r}" "\n" - " " f"{mod_path!r}" + " %r\n" + " %r" % (mod.__file__, mod_path) ) error_duplicates.append((mod.bl_info["name"], mod.__file__, mod_path)) @@ -241,7 +241,7 @@ def check(module_name): if loaded_state is Ellipsis: print( - "Warning: addon-module " f"{module_name:s}" " found module " + "Warning: addon-module", module_name, "found module " "but without '__addon_enabled__' field, " "possible name collision from file:", repr(getattr(mod, "__file__", "")), @@ -439,8 +439,9 @@ def disable(module_name, *, default_set=False, handle_error=None): handle_error(ex) else: print( - "addon_utils.disable: " f"{module_name:s}" " not", - ("disabled" if mod is None else "loaded") + "addon_utils.disable: %s not %s" % ( + module_name, + "disabled" if mod is None else "loaded") ) # could be in more than once, unlikely but better do this just in case. @@ -502,7 +503,7 @@ def _blender_manual_url_prefix(): else: manual_version = "dev" - return f"https://docs.blender.org/manual/en/{manual_version}" + return "https://docs.blender.org/manual/en/" + manual_version def module_bl_info(mod, info_basis=None): @@ -544,11 +545,11 @@ def module_bl_info(mod, info_basis=None): addon_info["doc_url"] = doc_url if _bpy.app.debug: print( - "Warning: add-on \"{addon_name}\": 'wiki_url' in 'bl_info' " + "Warning: add-on \"%s\": 'wiki_url' in 'bl_info' " "is deprecated please use 'doc_url' instead!\n" - " {addon_path}".format( - addon_name=addon_info['name'], - addon_path=getattr(mod, "__file__", None), + " %s" % ( + addon_info['name'], + getattr(mod, "__file__", None), ) ) diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py index b79c0b744d0..73004cee731 100644 --- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py +++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py @@ -505,7 +505,7 @@ def main(): if __name__ == "__main__": - print("\n\n *** Running {} *** \n".format(__file__)) - print(" *** Blend file {} *** \n".format(bpy.data.filepath)) + print("\n\n *** Running %s *** \n" % __file__) + print(" *** Blend file %s *** \n" % bpy.data.filepath) main() bpy.ops.wm.quit_blender() diff --git a/release/scripts/modules/bl_ui_utils/bug_report_url.py b/release/scripts/modules/bl_ui_utils/bug_report_url.py index 2adee70bc86..5676e0d6815 100644 --- a/release/scripts/modules/bl_ui_utils/bug_report_url.py +++ b/release/scripts/modules/bl_ui_utils/bug_report_url.py @@ -31,13 +31,13 @@ def url_prefill_from_blender(addon_info=None): fh.write("**System Information**\n") fh.write( - "Operating system: {!s} {!s} Bits\n".format( + "Operating system: %s %d Bits\n" % ( platform.platform(), struct.calcsize("P") * 8, ) ) fh.write( - "Graphics card: {!s} {!s} {!s}\n".format( + "Graphics card: %s %s %s\n" % ( bgl.glGetString(bgl.GL_RENDERER), bgl.glGetString(bgl.GL_VENDOR), bgl.glGetString(bgl.GL_VERSION), @@ -48,7 +48,7 @@ def url_prefill_from_blender(addon_info=None): "**Blender Version**\n" ) fh.write( - "Broken: version: {!s}, branch: {!s}, commit date: {!s} {!s}, hash: `rB{!s}`\n".format( + "Broken: version: %s, branch: %s, commit date: %s %s, hash: `rB%s`\n" % ( bpy.app.version_string, bpy.app.build_branch.decode('utf-8', 'replace'), bpy.app.build_commit_date.decode('utf-8', 'replace'), diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py index 8f8f42bcd46..4e226f80f79 100644 --- a/release/scripts/modules/bpy/ops.py +++ b/release/scripts/modules/bpy/ops.py @@ -123,7 +123,7 @@ class BPyOpsSubModOp: # op_class = getattr(bpy.types, idname) op_class = op_get_rna_type(idname) descr = op_class.description - return f"{sig}\n{descr}" + return "%s\n%s" % (sig, descr) @staticmethod def _parse_args(args): diff --git a/release/scripts/modules/bpy/utils/previews.py b/release/scripts/modules/bpy/utils/previews.py index bfdf28e0db4..7f337677635 100644 --- a/release/scripts/modules/bpy/utils/previews.py +++ b/release/scripts/modules/bpy/utils/previews.py @@ -76,8 +76,7 @@ class ImagePreviewCollection(dict): return raise ResourceWarning( - f"{self!r}: left open, remove with " - "'bpy.utils.previews.remove()'" + "%r: left open, remove with 'bpy.utils.previews.remove()'" % self ) self.close() @@ -116,7 +115,9 @@ class ImagePreviewCollection(dict): super().__delitem__(key) def __repr__(self): - return f"<{self.__class__.__name__:s} id={self._uuid:s}[{len(self):d}], {super()!r}>" + return "<%s id=%s[%d], %r>" % ( + self.__class__.__name__, self._uuid, len(self), super() + ) def new(): diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index e0aaea3c085..f8f37953f1c 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -234,7 +234,7 @@ class SequencerFadesAdd(Operator): sequence.invalidate('COMPOSITE') sequence_string = "sequence" if len(faded_sequences) == 1 else "sequences" - self.report({'INFO'}, "Added fade animation to {} {}.".format(len(faded_sequences), sequence_string)) + self.report({'INFO'}, "Added fade animation to %d %s." % (len(faded_sequences), sequence_string)) return {'FINISHED'} def calculate_fade_duration(self, context, sequence): @@ -362,7 +362,7 @@ class Fade: return max_value if max_value > 0.0 else 1.0 def __repr__(self): - return "Fade {}: {} to {}".format(self.type, self.start, self.end) + return "Fade %r: %r to %r" % (self.type, self.start, self.end) def calculate_duration_frames(context, duration_seconds): diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 4c4736cd669..04bd5687364 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1697,7 +1697,7 @@ class WM_OT_tool_set_by_id(Operator): tool_settings.workspace_tool_type = 'FALLBACK' return {'FINISHED'} else: - self.report({'WARNING'}, f"Tool {self.name!r:s} not found for space {space_type!r:s}.") + self.report({'WARNING'}, "Tool %r not found for space %r." % (self.name, space_type)) return {'CANCELLED'} @@ -2216,8 +2216,8 @@ class WM_OT_batch_rename(Operator): elif ty == 'STRIP': chars = action.strip_chars chars_strip = ( - "{:s}{:s}{:s}" - ).format( + "%s%s%s" + ) % ( string.punctuation if 'PUNCT' in chars else "", string.digits if 'DIGIT' in chars else "", " " if 'SPACE' in chars else "", @@ -2282,7 +2282,7 @@ class WM_OT_batch_rename(Operator): split.prop(self, "data_type", text="") split = layout.split(factor=0.5) - split.label(text="Rename {:d} {:s}:".format(len(self._data[0]), self._data[2])) + split.label(text="Rename %d %s:" % (len(self._data[0]), self._data[2])) split.row().prop(self, "data_source", expand=True) for action in self.actions: @@ -2397,7 +2397,7 @@ class WM_OT_batch_rename(Operator): change_len += 1 total_len += 1 - self.report({'INFO'}, "Renamed {:d} of {:d} {:s}".format(change_len, total_len, descr)) + self.report({'INFO'}, "Renamed %d of %d %s" % (change_len, total_len, descr)) return {'FINISHED'} diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 696883d965c..5b8d97488f9 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1528,7 +1528,7 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel): split.alignment = 'RIGHT' split.label(text="End") split = split.split(factor=0.8 + max_factor, align=True) - split.label(text="{:>14}".format(smpte_from_frame(frame_final_end))) + split.label(text="%14s" % smpte_from_frame(frame_final_end)) split.alignment = 'RIGHT' split.label(text=str(frame_final_end) + " ") @@ -1572,7 +1572,7 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel): split.label(text="Playhead") split = split.split(factor=0.8 + max_factor, align=True) frame_display = frame_current - frame_final_start - split.label(text="{:>14}".format(smpte_from_frame(frame_display))) + split.label(text="%14s" % smpte_from_frame(frame_display)) split.alignment = 'RIGHT' split.label(text=str(frame_display) + " ") diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py index e0651dcac2b..f052e42766c 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_common.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py @@ -450,7 +450,7 @@ class ToolSelectPanelHelper: @classmethod def _km_action_simple(cls, kc_default, kc, context_descr, label, keymap_fn): - km_idname = f"{cls.keymap_prefix:s} {context_descr:s}, {label:s}" + km_idname = "%s %s, %s" % (cls.keymap_prefix, context_descr, label) km = kc.keymaps.get(km_idname) km_kwargs = dict(space_type=cls.bl_space_type, region_type='WINDOW', tool=True) if km is None: diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 2605cf1e1b9..d52cc6a6dad 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -124,12 +124,12 @@ class _defs_view3d_generic: kmi_remove = None return tip_( "Measure distance and angles.\n" - "\u2022 {} anywhere for new measurement.\n" + "\u2022 %s anywhere for new measurement.\n" "\u2022 Drag ruler segment to measure an angle.\n" - "\u2022 {} to remove the active ruler.\n" + "\u2022 %s to remove the active ruler.\n" "\u2022 Ctrl while dragging to snap.\n" "\u2022 Shift while dragging to measure surface thickness" - ).format( + ) % ( kmi_to_string_or_none(kmi_add), kmi_to_string_or_none(kmi_remove), ) diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 599f89a000d..c1502165e44 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -45,7 +45,7 @@ class USERPREF_HT_header(Header): # Show '*' to let users know the preferences have been modified. layout.operator( "wm.save_userpref", - text="Save Preferences{:s}".format(" *" if prefs.is_dirty else ""), + text="Save Preferences" + (" *" if prefs.is_dirty else ""), ) def draw(self, context): @@ -1903,8 +1903,10 @@ class USERPREF_PT_addons(AddOnPanel, Panel): "wm.url_open", text="Report a Bug", icon='URL', ).url = info["tracker_url"] elif not user_addon: - addon_info = ("Name: {} {}\nAuthor: {}\n").format( - info["name"], info["version"], info["author"]) + addon_info = ( + "Name: %s %s\n" + "Author: %s\n" + ) % (info["name"], str(info["version"]), info["author"]) props = sub.operator( "wm.url_open_preset", text="Report a Bug", icon='URL', ) @@ -1987,7 +1989,7 @@ class StudioLightPanelMixin: for studio_light in lights: self.draw_studio_light(flow, studio_light) else: - layout.label(text="No custom {} configured".format(self.bl_label)) + layout.label(text="No custom %s configured" % self.bl_label) def draw_studio_light(self, layout, studio_light): box = layout.box() diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index d1fe3f649c8..1403e43a8af 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -5626,8 +5626,8 @@ class VIEW3D_PT_object_type_visibility(Panel): elif attr == "pointcloud" and not hasattr(bpy.data, "pointclouds"): continue - attr_v = "show_object_viewport_" f"{attr:s}" - attr_s = "show_object_select_" f"{attr:s}" + attr_v = "show_object_viewport_" + attr + attr_s = "show_object_select_" + attr icon_v = 'HIDE_OFF' if getattr(view, attr_v) else 'HIDE_ON' icon_s = 'RESTRICT_SELECT_OFF' if getattr(view, attr_s) else 'RESTRICT_SELECT_ON' -- cgit v1.2.3