update rebase

rmorshea · rmorshea · commit 8cd7878e35fa · 2015-10-20T19:47:15.000-07:00
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -114,7 +114,7 @@ def _stale_changed(self, name, new):
     transform_set = Bool(False)
 
     def _axes_changed(self, name, old, new):
-        if old not in (Undefined,None):
+        if new and old not in (Undefined,None):
             raise ValueError("Can not reset the axes.  You are "
                              "probably trying to re-use an artist "
                              "in more than one Axes which is not "
@@ -124,7 +124,7 @@ def _axes_changed(self, name, old, new):
 
     axes = Instance(str('matplotlib.axes.Axes'), allow_none=True)
 
-    figure = Instance(str('matplotlib.figure.Figure'), allow_none=True)
+    figure = Instance(str('matplotlib.figure.FigureBase'), allow_none=True)
 
     def _figure_changed(self, name, old, new):
         if old not in (None, Undefined):
@@ -259,9 +259,13 @@ def remove(self):
                 _ax_flag = True
 
             if self.figure:
-                self.figure = None
+                self.private('figure', None)
                 if not _ax_flag:
-                    self.figure = True
+                    from matplotlib.figure import FigureBase
+                    # was originally self.private(figure, True)
+                    # which won't pass validation. For the moment,
+                    # use an empty base class to pass validation.
+                    self.private('figure', FigureBase())
 
         else:
             raise NotImplementedError('cannot remove artist')
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -238,8 +238,12 @@ def _update_this(self, s, val):
 
         setattr(self, s, val)
 
+# used solely for passing an empty figure class to
+# the "figure" attribute of an artist which will pass
+# a boolean test (e.g `True if figure else False`)
+class FigureBase(object): pass
 
-class Figure(Artist):
+class Figure(FigureBase, Artist):
 
     """
     The Figure instance supports callbacks through a *callbacks*
