diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-06-26 05:30:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-26 05:33:19 +0300 |
commit | 646ef49e197d14e7717547a3f9ed119f5a79e2a8 (patch) | |
tree | 29daa5c9d2cc82dd6c7cd1112449558111d6f5d2 /release/scripts/modules | |
parent | 2db4a81fe4af0a003e545b6834c038eb7b704744 (diff) |
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.
Diffstat (limited to 'release/scripts/modules')
-rw-r--r-- | release/scripts/modules/addon_utils.py | 21 | ||||
-rw-r--r-- | release/scripts/modules/bl_previews_utils/bl_previews_render.py | 4 | ||||
-rw-r--r-- | release/scripts/modules/bl_ui_utils/bug_report_url.py | 6 | ||||
-rw-r--r-- | release/scripts/modules/bpy/ops.py | 2 | ||||
-rw-r--r-- | release/scripts/modules/bpy/utils/previews.py | 7 |
5 files changed, 21 insertions, 19 deletions
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__", "<unknown>")), @@ -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(): |