Fix unshare None.

lkjell · lkjell · commit 07375a02fb2b · 2018-03-09T11:28:39.000+01:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -4265,20 +4265,23 @@ def _unshare_axes(self, axes, shared_axes):
                     getattr(axes, "{}axis".format(shared_axes)))
             except KeyError:
                 pass
+            return
 
         if axes is None:
+            for ax in shared:
+                if ax is self:
+                    continue
+                getattr(ax, "_shared_{}_inv_axes".format(
+                    shared_axes)).remove(self)
+
             shared.clear()
             shared.add(self)
             axes = self
 
         if axes is self:
             shared = getattr(self, "_shared_{}_inv_axes".format(shared_axes))
             for ax in shared:
-                shared_ax = getattr(ax, "_shared_{}_axes".format(shared_axes))
-                try:
-                    shared_ax.remove(self)
-                except KeyError:
-                    pass
+                getattr(ax, "_shared_{}_axes".format(shared_axes)).remove(self)
 
             shared.clear()
             self._copy_axis_major_minor(
