Merge remote-tracking branch 'matplotlib/v2.x'

tacaswell · tacaswell · commit 5d56ca8ee574 · 2016-02-08T18:56:38.000-05:00
Conflicts:
	.travis.yml
	   resolved in favor of master
	lib/matplotlib/cbook.py
	   resolved in favor of v2.x
	lib/matplotlib/font_manager.py
	   resolved in favor of master
	tests.py
	   resolved in favor of master
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/artist.py b/lib/matplotlib/artist.py
@@ -1583,5 +1583,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/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/cbook.py b/lib/matplotlib/cbook.py
@@ -2451,6 +2451,13 @@ def get_label(y, default_name):
     def _putmask(a, mask, values):
         return np.copyto(a, values, where=mask)
 
+_lockstr = """\
+LOCKERROR: matplotlib is trying to acquire the lock {!r}
+and has failed.  This maybe due to any other process holding this
+lock.  If you are sure no other matplotlib process in running try
+removing this folder(s) and trying again.
+"""
+
 
 class Locked(object):
     """
@@ -2462,29 +2469,31 @@ class Locked(object):
     All Rights Reserved
 
     conda is distributed under the terms of the BSD 3-clause license.
-    Consult LICENSE.txt or http://opensource.org/licenses/BSD-3-Clause.
+    Consult LICENSE_CONDA or http://opensource.org/licenses/BSD-3-Clause.
     """
+    LOCKFN = '.matplotlib_lock'
+
     def __init__(self, path):
-        LOCKFN = '.matplotlib_lock'
         self.path = path
         self.end = "-" + str(os.getpid())
-        self.lock_path = os.path.join(self.path, LOCKFN + self.end)
-        self.pattern = os.path.join(self.path, LOCKFN + '-*')
+        self.lock_path = os.path.join(self.path, self.LOCKFN + self.end)
+        self.pattern = os.path.join(self.path, self.LOCKFN + '-*')
         self.remove = True
 
     def __enter__(self):
-        retries = 10
+        retries = 50
         sleeptime = 1
         while retries:
             files = glob.glob(self.pattern)
             if files and not files[0].endswith(self.end):
                 time.sleep(sleeptime)
-                sleeptime *= 2
+                sleeptime *= 1.1
                 retries -= 1
             else:
                 break
         else:
-            raise RuntimeError(lockstr)
+            err_str = _lockstr.format(self.pattern)
+            raise RuntimeError(err_str)
 
         if not files:
             try:
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -1070,7 +1070,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/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")
