From 5c0d8bcdc7c928d389f54ce3beb6f7d9d3c63021 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 30 Jun 2018 09:23:07 +0200 Subject: Cleanup: use f-string --- release/scripts/modules/bpy/utils/previews.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'release') diff --git a/release/scripts/modules/bpy/utils/previews.py b/release/scripts/modules/bpy/utils/previews.py index 568116b027c..a3baf8f878c 100644 --- a/release/scripts/modules/bpy/utils/previews.py +++ b/release/scripts/modules/bpy/utils/previews.py @@ -37,7 +37,7 @@ __all__ = ( "new", "remove", "ImagePreviewCollection", - ) +) import _bpy _utils_previews = _bpy._utils_previews @@ -76,9 +76,9 @@ class ImagePreviewCollection(dict): return raise ResourceWarning( - "<%s id=%s[%d]>: left open, remove with " - "'bpy.utils.previews.remove()'" % - (self.__class__.__name__, self._uuid, len(self))) + f"{self!r}: left open, remove with " + "'bpy.utils.previews.remove()'" + ) self.close() def _gen_key(self, name): @@ -86,17 +86,17 @@ class ImagePreviewCollection(dict): def new(self, name): if name in self: - raise KeyError("key %r already exists" % name) + raise KeyError(f"key {name!r} already exists") p = self[name] = _utils_previews.new( - self._gen_key(name)) + self._gen_key(name)) return p new.__doc__ = _utils_previews.new.__doc__ def load(self, name, path, path_type, force_reload=False): if name in self: - raise KeyError("key %r already exists" % name) + raise KeyError("key {name!r} already exists") p = self[name] = _utils_previews.load( - self._gen_key(name), path, path_type, force_reload) + self._gen_key(name), path, path_type, force_reload) return p load.__doc__ = _utils_previews.load.__doc__ @@ -116,11 +116,7 @@ class ImagePreviewCollection(dict): super().__delitem__(key) def __repr__(self): - return "<%s id=%s[%d], %s>" % ( - self.__class__.__name__, - self._uuid, - len(self), - super().__repr__()) + return f"<{self.__class__.__name__:s} id={self._uuid:s}[{len(self):d}], {super()!r}>" def new(): @@ -149,5 +145,6 @@ import atexit def exit_clear_warning(): del ImagePreviewCollection.__del__ + atexit.register(exit_clear_warning) del atexit, exit_clear_warning -- cgit v1.2.3