Remove unnecessary/replaceable explicit str calls.

Author: anntzer

examples/event_handling/pong_sgskip.py

@@ -220,10 +220,8 @@ def draw(self):
             for puck in self.pucks:
                 if puck.update(self.pads):
                     # we only get here if someone scored
-                    self.pads[0].disp.set_label(
-                        "   " + str(self.pads[0].score))
-                    self.pads[1].disp.set_label(
-                        "   " + str(self.pads[1].score))
+                    self.pads[0].disp.set_label(f"   {self.pads[0].score}")
+                    self.pads[1].disp.set_label(f"   {self.pads[1].score}")
                     self.ax.legend(loc='center', framealpha=.2,
                                    facecolor='0.5',
                                    prop=FontProperties(size='xx-large',

examples/units/basic_units.py

@@ -153,7 +153,7 @@ def __repr__(self):
         return 'TaggedValue({!r}, {!r})'.format(self.value, self.unit)
 
     def __str__(self):
-        return str(self.value) + ' in ' + str(self.unit)
+        return f"{self.value} in {self.unit}"
 
     def __len__(self):
         return len(self.value)

examples/user_interfaces/toolmanager_sgskip.py

@@ -27,22 +27,22 @@ class ListTools(ToolBase):
 
     def trigger(self, *args, **kwargs):
         print('_' * 80)
-        print("{0:12} {1:45} {2}".format(
-            'Name (id)', 'Tool description', 'Keymap'))
+        fmt_tool = "{:12} {:45} {}".format
+        print(fmt_tool('Name (id)', 'Tool description', 'Keymap'))
         print('-' * 80)
         tools = self.toolmanager.tools
         for name in sorted(tools):
             if not tools[name].description:
                 continue
             keys = ', '.join(sorted(self.toolmanager.get_tool_keymap(name)))
-            print("{0:12} {1:45} {2}".format(
-                name, tools[name].description, keys))
+            print(fmt_tool(name, tools[name].description, keys))
         print('_' * 80)
+        fmt_active_toggle = "{0!s:12} {1!s:45}".format
         print("Active Toggle tools")
-        print("{0:12} {1:45}".format("Group", "Active"))
+        print(fmt_active_toggle("Group", "Active"))
         print('-' * 80)
         for group, active in self.toolmanager.active_toggle.items():
-            print("{0:12} {1:45}".format(str(group), str(active)))
+            print(fmt_active_toggle(group, active))
 
 
 class GroupHideTool(ToolToggleBase):

lib/matplotlib/backends/backend_wx.py

@@ -1149,7 +1149,7 @@ def save_figure(self, *args):
             if mpl.rcParams["savefig.directory"]:
                 mpl.rcParams["savefig.directory"] = str(path.parent)
             try:
-                self.canvas.figure.savefig(str(path), format=fmt)
+                self.canvas.figure.savefig(path, format=fmt)
             except Exception as e:
                 dialog = wx.MessageDialog(
                     parent=self.canvas.GetParent(), message=str(e),

lib/matplotlib/font_manager.py

@@ -1084,7 +1084,7 @@ def __init__(self, size=None, weight='normal'):
         # Create list of font paths.
         paths = [cbook._get_data_path('fonts', subdir)
                  for subdir in ['ttf', 'afm', 'pdfcorefonts']]
-        _log.debug('font search path %s', str(paths))
+        _log.debug('font search path %s', paths)
 
         self.defaultFamily = {
             'ttf': 'DejaVu Sans',

lib/matplotlib/patches.py

@@ -610,7 +610,7 @@ def _convert_xy_units(self, xy):
 
 class Shadow(Patch):
     def __str__(self):
-        return "Shadow(%s)" % (str(self.patch))
+        return f"Shadow({self.patch})"
 
     @_docstring.dedent_interpd
     def __init__(self, patch, ox, oy, **kwargs):

lib/matplotlib/path.py

@@ -460,7 +460,7 @@ def iter_bezier(self, **kwargs):
             elif code == Path.STOP:
                 return
             else:
-                raise ValueError("Invalid Path.code_type: " + str(code))
+                raise ValueError(f"Invalid Path.code_type: {code}")
             prev_vert = verts[-2:]
 
     def cleaned(self, transform=None, remove_nans=False, clip=None,

lib/matplotlib/sphinxext/plot_directive.py

@@ -486,13 +486,13 @@ def _run_code(code, code_path, ns=None, function_name=None):
         try:
             os.chdir(setup.config.plot_working_directory)
         except OSError as err:
-            raise OSError(str(err) + '\n`plot_working_directory` option in'
-                          'Sphinx configuration file must be a valid '
-                          'directory path') from err
+            raise OSError(f'{err}\n`plot_working_directory` option in '
+                          f'Sphinx configuration file must be a valid '
+                          f'directory path') from err
         except TypeError as err:
-            raise TypeError(str(err) + '\n`plot_working_directory` option in '
-                            'Sphinx configuration file must be a string or '
-                            'None') from err
+            raise TypeError(f'{err}\n`plot_working_directory` option in '
+                            f'Sphinx configuration file must be a string or '
+                            f'None') from err
     elif code_path is not None:
         dirname = os.path.abspath(os.path.dirname(code_path))
         os.chdir(dirname)

lib/matplotlib/tests/test_png.py

@@ -26,18 +26,17 @@ def test_pngsuite():
     plt.gca().set_xlim(0, len(files))
 
 
-def test_truncated_file(tmpdir):
-    d = tmpdir.mkdir('test')
-    fname = str(d.join('test.png'))
-    fname_t = str(d.join('test_truncated.png'))
-    plt.savefig(fname)
-    with open(fname, 'rb') as fin:
+def test_truncated_file(tmp_path):
+    path = tmp_path / 'test.png'
+    path_t = tmp_path / 'test_truncated.png'
+    plt.savefig(path)
+    with open(path, 'rb') as fin:
         buf = fin.read()
-    with open(fname_t, 'wb') as fout:
+    with open(path_t, 'wb') as fout:
         fout.write(buf[:20])
 
     with pytest.raises(Exception):
-        plt.imread(fname_t)
+        plt.imread(path_t)
 
 
 def test_truncated_buffer():

lib/matplotlib/ticker.py

@@ -804,7 +804,7 @@ def _set_format(self):
             else:
                 break
         sigfigs += 1
-        self.format = '%1.' + str(sigfigs) + 'f'
+        self.format = f'%1.{sigfigs}f'
         if self._usetex or self._useMathText:
             self.format = r'$\mathdefault{%s}$' % self.format