Merge pull request matplotlib#10332 from anntzer/join-strings

Join strings instead of adding them.

Author: timhoffm

lib/matplotlib/animation.py

@@ -842,11 +842,9 @@ def _included_frames(frame_list, frame_format):
 def _embedded_frames(frame_list, frame_format):
     """frame_list should be a list of base64-encoded png files"""
     template = '  frames[{0}] = "data:image/{1};base64,{2}"\n'
-    embedded = "\n"
-    for i, frame_data in enumerate(frame_list):
-        embedded += template.format(i, frame_format,
-                                    frame_data.replace('\n', '\\\n'))
-    return embedded
+    return "\n" + "".join(
+        template.format(i, frame_format, frame_data.replace('\n', '\\\n'))
+        for i, frame_data in enumerate(frame_list))
 
 
 @writers.register('html')

lib/matplotlib/backends/backend_pgf.py

@@ -582,11 +582,10 @@ def _print_pgf_path_styles(self, gc, rgbFace):
         if dash_list is None:
             writeln(self.fh, r"\pgfsetdash{}{0pt}")
         else:
-            dash_str = r"\pgfsetdash{"
-            for dash in dash_list:
-                dash_str += r"{%fpt}" % dash
-            dash_str += r"}{%fpt}" % dash_offset
-            writeln(self.fh, dash_str)
+            writeln(self.fh,
+                    r"\pgfsetdash{%s}{%fpt}"
+                    % ("".join(r"{%fpt}" % dash for dash in dash_list),
+                       dash_offset))
 
     def _print_pgf_path(self, gc, path, transform, rgbFace=None):
         f = 1. / self.dpi

lib/matplotlib/backends/backend_wx.py

@@ -1446,12 +1446,9 @@ def getActiveAxes(self):
         return active
 
     def updateButtonText(self, lst):
-        """Update the list of selected axes in the menu button"""
-        axis_txt = ''
-        for e in lst:
-            axis_txt += '%d,' % (e + 1)
-        # remove trailing ',' and add to button string
-        self.SetLabel("Axes: %s" % axis_txt[:-1])
+        """Update the list of selected axes in the menu button."""
+        self.SetLabel(
+            'Axes: ' + ','.join('%d' % (e + 1) for e in lst))
 
 
 cursord = {

lib/matplotlib/legend.py

@@ -1311,12 +1311,12 @@ def _get_legend_handles(axs, legend_handler_map=None):
     handles_original = []
     for ax in axs:
         handles_original += (ax.lines + ax.patches +
-                        ax.collections + ax.containers)
+                             ax.collections + ax.containers)
         # support parasite axes:
         if hasattr(ax, 'parasites'):
             for axx in ax.parasites:
                 handles_original += (axx.lines + axx.patches +
-                        axx.collections + axx.containers)
+                                     axx.collections + axx.containers)
 
     handler_map = Legend.get_default_handler_map()