Merge branch 'v2.0.x'

mdboom · mdboom · commit 9f6bb901f92a · 2015-12-17T15:35:53.000-05:00
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1559,7 +1559,7 @@ class Grouper(object):
         False
 
     """
-    def __init__(self, init=[]):
+    def __init__(self, init=()):
         mapping = self._mapping = {}
         for x in init:
             mapping[ref(x)] = [ref(x)]
@@ -1611,6 +1611,14 @@ def joined(self, a, b):
         except KeyError:
             return False
 
+    def remove(self, a):
+        self.clean()
+
+        mapping = self._mapping
+        seta = mapping.pop(ref(a), None)
+        if seta is not None:
+            seta.remove(ref(a))
+
     def __iter__(self):
         """
         Iterate over each of the disjoint sets as a list.
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -917,7 +917,7 @@ def add_axes(self, *args, **kwargs):
 
         self._axstack.add(key, a)
         self.sca(a)
-        a._remove_method = lambda ax: self.delaxes(ax)
+        a._remove_method = self.__remove_ax
         self.stale = True
         a.stale_callback = _stale_figure_callback
         return a
@@ -1007,7 +1007,7 @@ def add_subplot(self, *args, **kwargs):
 
         self._axstack.add(key, a)
         self.sca(a)
-        a._remove_method = lambda ax: self.delaxes(ax)
+        a._remove_method = self.__remove_ax
         self.stale = True
         a.stale_callback = _stale_figure_callback
         return a
@@ -1144,6 +1144,32 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             # Returned axis array will be always 2-d, even if nrows=ncols=1.
             return axarr
 
+    def __remove_ax(self, ax):
+        def _reset_loc_form(axis):
+            axis.set_major_formatter(axis.get_major_formatter())
+            axis.set_major_locator(axis.get_major_locator())
+            axis.set_minor_formatter(axis.get_minor_formatter())
+            axis.set_minor_locator(axis.get_minor_locator())
+
+        def _break_share_link(ax, grouper):
+            siblings = grouper.get_siblings(ax)
+            if len(siblings) > 1:
+                grouper.remove(ax)
+                for last_ax in siblings:
+                    if ax is last_ax:
+                        continue
+                    return last_ax
+            return None
+
+        self.delaxes(ax)
+        last_ax = _break_share_link(ax, ax._shared_y_axes)
+        if last_ax is not None:
+            _reset_loc_form(last_ax.yaxis)
+
+        last_ax = _break_share_link(ax, ax._shared_x_axes)
+        if last_ax is not None:
+            _reset_loc_form(last_ax.xaxis)
+
     def clf(self, keep_observers=False):
         """
         Clear the figure.
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4197,6 +4197,49 @@ def test_auto_numticks():
     fig, axes = plt.subplots(4, 4)
 
 
+def test_remove_shared_axes():
+    def _helper_x(ax):
+        ax2 = ax.twinx()
+        ax2.remove()
+        ax.set_xlim(0, 15)
+        r = ax.xaxis.get_major_locator()()
+        assert r[-1] > 14
+
+    def _helper_y(ax):
+        ax2 = ax.twiny()
+        ax2.remove()
+        ax.set_ylim(0, 15)
+        r = ax.yaxis.get_major_locator()()
+        assert r[-1] > 14
+
+    # test all of the ways to get fig/ax sets
+    fig = plt.figure()
+    ax = fig.gca()
+    yield _helper_x, ax
+    yield _helper_y, ax
+
+    fig, ax = plt.subplots()
+    yield _helper_x, ax
+    yield _helper_y, ax
+
+    fig, ax_lst = plt.subplots(2, 2, sharex='all', sharey='all')
+    ax = ax_lst[0][0]
+    yield _helper_x, ax
+    yield _helper_y, ax
+
+    fig = plt.figure()
+    ax = fig.add_axes([.1, .1, .8, .8])
+    yield _helper_x, ax
+    yield _helper_y, ax
+
+    fig, ax_lst = plt.subplots(2, 2, sharex='all', sharey='all')
+    ax = ax_lst[0][0]
+    orig_xlim = ax_lst[0][1].get_xlim()
+    ax.remove()
+    ax.set_xlim(0, 5)
+    assert assert_array_equal(ax_lst[0][1].get_xlim(), orig_xlim)
+
+
 if __name__ == '__main__':
     import nose
     import sys
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
@@ -1,5 +1,7 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
+import itertools
+from weakref import ref
 
 from matplotlib.externals import six
 
@@ -376,3 +378,40 @@ def test_step_fails():
                   np.arange(12))
     assert_raises(ValueError, cbook._step_validation,
                   np.arange(12), np.arange(3))
+
+
+def test_grouper():
+    class dummy():
+        pass
+    a, b, c, d, e = objs = [dummy() for j in range(5)]
+    g = cbook.Grouper()
+    g.join(*objs)
+    assert set(list(g)[0]) == set(objs)
+    assert set(g.get_siblings(a)) == set(objs)
+
+    for other in objs[1:]:
+        assert g.joined(a, other)
+
+    g.remove(a)
+    for other in objs[1:]:
+        assert not g.joined(a, other)
+
+    for A, B in itertools.product(objs[1:], objs[1:]):
+        assert g.joined(A, B)
+
+
+def test_grouper_private():
+    class dummy():
+        pass
+    objs = [dummy() for j in range(5)]
+    g = cbook.Grouper()
+    g.join(*objs)
+    # reach in and touch the internals !
+    mapping = g._mapping
+
+    for o in objs:
+        assert ref(o) in mapping
+
+    base_set = mapping[ref(objs[0])]
+    for o in objs[1:]:
+        assert mapping[ref(o)] is base_set
diff --git a/lib/mpl_toolkits/axes_grid1/colorbar.py b/lib/mpl_toolkits/axes_grid1/colorbar.py
@@ -374,9 +374,8 @@ def __init__(self, ax, cmap=None,
         if format is None:
             if isinstance(self.norm, colors.LogNorm):
                 # change both axis for proper aspect
-                self.ax.xaxis.set_scale("log")
-                self.ax.yaxis.set_scale("log")
-                self.ax._update_transScale()
+                self.ax.set_xscale("log")
+                self.ax.set_yscale("log")
                 self.cbar_axis.set_minor_locator(ticker.NullLocator())
                 formatter = ticker.LogFormatter()
             else:
diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -5,9 +5,11 @@
 
 import matplotlib
 import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import image_comparison
-from mpl_toolkits.axes_grid1 import make_axes_locatable, host_subplot
+from matplotlib.testing.decorators import image_comparison, cleanup
+from mpl_toolkits.axes_grid1 import make_axes_locatable, host_subplot, AxesGrid
+from matplotlib.colors import LogNorm
 from itertools import product
+
 import numpy as np
 
 
@@ -83,6 +85,22 @@ def test_twin_axes_empty_and_removed():
     plt.subplots_adjust(wspace=0.5, hspace=1)
 
 
+@cleanup
+def test_axesgrid_colorbar_log_smoketest():
+    fig = plt.figure()
+    grid = AxesGrid(fig, 111,  # modified to be only subplot
+                    nrows_ncols=(1, 1),
+                    label_mode="L",
+                    cbar_location="top",
+                    cbar_mode="single",
+                    )
+
+    Z = 10000 * np.random.rand(10, 10)
+    im = grid[0].imshow(Z, interpolation="nearest", norm=LogNorm())
+
+    grid.cbar_axes[0].colorbar(im)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/setup.py b/setup.py
@@ -137,6 +137,7 @@ def run(self):
         print("Matplotlib does not support running tests with "
               "'python setup.py test'. Please run 'python tests.py'")
 
+
 class BuildExtraLibraries(BuildExtCommand):
     def run(self):
         for package in good_packages:
@@ -149,6 +150,7 @@ def run(self):
 cmdclass['test'] = NoopTestCommand
 cmdclass['build_ext'] = BuildExtraLibraries
 
+
 # patch bdist_wheel for a bug on windows
 # https://bitbucket.org/pypa/wheel/issues/91/cannot-create-a-file-when-that-file
 if os.name == 'nt':
