merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

tacaswell · tacaswell · commit e64a0a1b5ae4 · 2016-02-08T18:45:53.000-05:00
diff --git a/examples/pylab_examples/barchart_demo2.py b/examples/pylab_examples/barchart_demo2.py
@@ -50,7 +50,7 @@ def format_score(scr, test):
     """
     md = testMeta[test]
     if md:
-        return '{}\n{}'.format(scr, md)
+        return '{0}\n{1}'.format(scr, md)
     else:
         return scr
 
@@ -86,7 +86,7 @@ def plot_student_results(student, scores, cohort_size):
     # Plot a solid vertical gridline to highlight the median position
     ax1.axvline(50, color='grey', alpha=0.25)
     # set X-axis tick marks at the deciles
-    cohort_label = ax1.text(.5, -.07, 'Cohort Size: {}'.format(cohort_size),
+    cohort_label = ax1.text(.5, -.07, 'Cohort Size: {0}'.format(cohort_size),
                             horizontalalignment='center', size='small',
                             transform=ax1.transAxes)
 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -553,7 +553,13 @@ def _create_tmp_config_dir():
         # Some restricted platforms (such as Google App Engine) do not provide
         # gettempdir.
         return None
-    tempdir = os.path.join(tempdir, 'matplotlib-%s' % getpass.getuser())
+
+    try:
+        username = getpass.getuser()
+    except KeyError:
+        username = str(os.getuid())
+    tempdir = os.path.join(tempdir, 'matplotlib-%s' % username)
+
     os.environ['MPLCONFIGDIR'] = tempdir
 
     mkdirs(tempdir)
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1582,5 +1582,5 @@ def kwdoc(a):
 
 docstring.interpd.update(Artist=kwdoc(Artist))
 
-_get_axes_msg = """{} has been deprecated in mpl 1.5, please use the
+_get_axes_msg = """{0} has been deprecated in mpl 1.5, please use the
 axes property.  A removal date has not been set."""
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3146,16 +3146,16 @@ def boxplot(self, x, notch=None, sym=None, vert=None, whis=None,
            If True produces boxes with the Patch artist
 
         showmeans : bool, default = False
-           If True, will toggle one the rendering of the means
+           If True, will toggle on the rendering of the means
 
         showcaps : bool, default = True
-           If True, will toggle one the rendering of the caps
+           If True, will toggle on the rendering of the caps
 
         showbox : bool, default = True
-           If True, will toggle one the rendering of box
+           If True, will toggle on the rendering of the box
 
         showfliers : bool, default = True
-           If True, will toggle one the rendering of the fliers
+           If True, will toggle on the rendering of the fliers
 
         boxprops : dict or None (default)
            If provided, will set the plotting style of the boxes
@@ -3411,16 +3411,16 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
           If `True`, will produce a notched box plot
 
         showmeans : bool, default = False
-          If `True`, will toggle one the rendering of the means
+          If `True`, will toggle on the rendering of the means
 
         showcaps  : bool, default = True
-          If `True`, will toggle one the rendering of the caps
+          If `True`, will toggle on the rendering of the caps
 
         showbox  : bool, default = True
-          If `True`, will toggle one the rendering of box
+          If `True`, will toggle on the rendering of the box
 
         showfliers : bool, default = True
-          If `True`, will toggle one the rendering of the fliers
+          If `True`, will toggle on the rendering of the fliers
 
         boxprops : dict or None (default)
           If provided, will set the plotting style of the boxes
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -249,25 +249,27 @@ def get_loc(self):
     @allow_rasterization
     def draw(self, renderer):
         if not self.get_visible():
+            self.stale = False
             return
-        renderer.open_group(self.__name__)
+
         midPoint = mtransforms.interval_contains(self.get_view_interval(),
                                                  self.get_loc())
 
         if midPoint:
+            renderer.open_group(self.__name__)
             if self.gridOn:
                 self.gridline.draw(renderer)
             if self.tick1On:
                 self.tick1line.draw(renderer)
             if self.tick2On:
                 self.tick2line.draw(renderer)
 
-        if self.label1On:
-            self.label1.draw(renderer)
-        if self.label2On:
-            self.label2.draw(renderer)
+            if self.label1On:
+                self.label1.draw(renderer)
+            if self.label2On:
+                self.label2.draw(renderer)
+            renderer.close_group(self.__name__)
 
-        renderer.close_group(self.__name__)
         self.stale = False
 
     def set_label1(self, s):
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1452,6 +1452,10 @@ def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
     # multiple
     if sys.platform == 'win32': precmd = '%s &&'% os.path.splitdrive(tmpdir)[0]
     else: precmd = ''
+    #Replace \\ for / so latex does not think there is a function call
+    latexfile = latexfile.replace("\\", "/")
+    # Replace ~ so Latex does not think it is line break
+    latexfile = latexfile.replace("~", "\\string~")
     command = '%s cd "%s" && latex -interaction=nonstopmode "%s" > "%s"'\
                 %(precmd, tmpdir, latexfile, outfile)
     verbose.report(command, 'debug')
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -1071,7 +1071,7 @@ def set_linestyle(self, ls):
                 ls = ls_mapper_r[ls]
             except KeyError:
                 raise ValueError(("You passed in an invalid linestyle, "
-                                  "`{}`.  See "
+                                  "`{0}`.  See "
                                   "docs of Line2D.set_linestyle for "
                                   "valid values.").format(ls))
 
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -710,7 +710,7 @@ def _h_arrows(self, length):
                                           # by a float first, as with 'mid'.
         elif self.pivot != 'tail':
             raise ValueError(("Quiver.pivot must have value in {{'middle', "
-                              "'tip', 'tail'}} not {}").format(self.pivot))
+                              "'tip', 'tail'}} not {0}").format(self.pivot))
 
         tooshort = length < self.minlength
         if tooshort.any():
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -132,6 +132,46 @@ def test_patheffects():
             fig.savefig(ps, format='ps')
 
 
+@cleanup
+@needs_tex
+@needs_ghostscript
+def test_tilde_in_tempfilename():
+    # Tilde ~ in the tempdir path (e.g. TMPDIR, TMP oder TEMP on windows
+    # when the username is very long and windows uses a short name) breaks
+    # latex before https://github.com/matplotlib/matplotlib/pull/5928
+    import tempfile
+    import shutil
+    import os
+    import os.path
+
+    tempdir = None
+    old_tempdir = tempfile.tempdir
+    try:
+        # change the path for new tempdirs, which is used
+        # internally by the ps backend to write a file
+        tempdir = tempfile.mkdtemp()
+        base_tempdir = os.path.join(tempdir, "short~1")
+        os.makedirs(base_tempdir)
+        tempfile.tempdir = base_tempdir
+
+        # usetex results in the latex call, which does not like the ~
+        plt.rc('text', usetex=True)
+        plt.plot([1, 2, 3, 4])
+        plt.xlabel(r'\textbf{time} (s)')
+        #matplotlib.verbose.set_level("debug")
+        output_eps = os.path.join(base_tempdir, 'tex_demo.eps')
+        # use the PS backend to write the file...
+        plt.savefig(output_eps, format="ps")
+    finally:
+        tempfile.tempdir = old_tempdir
+        if tempdir:
+            try:
+                shutil.rmtree(tempdir)
+            except Exception as e:
+                # do not break if this is not removeable...
+                print(e)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/mpl_toolkits/axes_grid1/axes_rgb.py b/lib/mpl_toolkits/axes_grid1/axes_rgb.py
@@ -205,9 +205,9 @@ def imshow_rgb(self, r, g, b, **kwargs):
         ny, nx = r.shape
         if not ((nx, ny) == g.shape == b.shape):
             raise ValueError('Input shapes do not match.'
-                             '\nr.shape = {}'
-                             '\ng.shape = {}'
-                             '\nb.shape = {}'
+                             '\nr.shape = {0}'
+                             '\ng.shape = {1}'
+                             '\nb.shape = {2}'
                              ''.format(r.shape, g.shape, b.shape))
 
         R = np.zeros([ny, nx, 3], dtype="d")
