From b412654967472bde3e4326cafa94749557283dc3 Mon Sep 17 00:00:00 2001
From: Federico Ariza <ariza.federico@gmail.com>
Date: Mon, 22 Jun 2015 14:52:52 -0400
Subject: [PATCH 1/2] figure attribute and canvas property

---
 lib/matplotlib/backend_managers.py | 31 +++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
index 8d06a7c04945..ec91bf9b24ef 100644
--- a/lib/matplotlib/backend_managers.py
+++ b/lib/matplotlib/backend_managers.py
@@ -61,6 +61,9 @@ class FigureManager(cbook.EventEmitter):
     canvas : `matplotlib.backend_bases.FigureCanvasBase`
         The GUI element on which we draw.
 
+    figure : `matplotlib.figure.Figure`
+        The figure that holds the canvas
+
     toolbar : `matplotlib.backend_bases.NavigationToolbar2`
         The toolbar used for interacting with the figure.
 
@@ -79,14 +82,15 @@ def __init__(self, figure, num):
         self.window = self._backend.Window('Figure %d' % num)
         self.window.mpl_connect('window_destroy_event', self.destroy)
 
-        self.canvas = self._backend.FigureCanvas(figure, manager=self)
+        self._figure = None
+        self._set_figure(figure)
 
-        w = int(self.canvas.figure.bbox.width)
-        h = int(self.canvas.figure.bbox.height)
+        w = int(self.figure.bbox.width)
+        h = int(self.figure.bbox.height)
 
-        self.window.add_element(self.canvas, True, 'center')
+        self.window.add_element(self.figure.canvas, True, 'center')
 
-        self.toolmanager = ToolManager(self.canvas)
+        self.toolmanager = ToolManager(self.figure.canvas)
         self.toolbar = self._get_toolbar()
 
         tools.add_tools_to_manager(self.toolmanager)
@@ -108,7 +112,20 @@ def notify_axes_change(fig):
             'this will be called whenever the current axes is changed'
             if self.toolmanager is None and self.toolbar is not None:
                 self.toolbar.update()
-        self.canvas.figure.add_axobserver(notify_axes_change)
+        self.figure.add_axobserver(notify_axes_change)
+
+    @property
+    def figure(self):
+        return self._figure
+
+    def _set_figure(self, figure):
+        if not figure.canvas:
+            self._backend.FigureCanvas(figure, manager=self)
+        self._figure = figure
+
+    @property
+    def canvas(self):
+        return self._figure.canvas
 
     def destroy(self, *args):
         """Called to destroy this FigureManager.
@@ -120,7 +137,7 @@ def destroy(self, *args):
             return
 
         self._destroying = True
-        self.canvas.destroy()
+        self.figure.canvas.destroy()
         if self.toolbar:
             self.toolbar.destroy()
         self.window.destroy()

From ca3a56049cf89b8545f1b49b832fabe28a3814f2 Mon Sep 17 00:00:00 2001
From: Federico Ariza <ariza.federico@gmail.com>
Date: Thu, 25 Jun 2015 10:56:01 -0400
Subject: [PATCH 2/2] figure setter

---
 lib/matplotlib/backend_managers.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
index ec91bf9b24ef..f6b2c860d3ba 100644
--- a/lib/matplotlib/backend_managers.py
+++ b/lib/matplotlib/backend_managers.py
@@ -82,8 +82,7 @@ def __init__(self, figure, num):
         self.window = self._backend.Window('Figure %d' % num)
         self.window.mpl_connect('window_destroy_event', self.destroy)
 
-        self._figure = None
-        self._set_figure(figure)
+        self.figure = figure
 
         w = int(self.figure.bbox.width)
         h = int(self.figure.bbox.height)
@@ -118,7 +117,11 @@ def notify_axes_change(fig):
     def figure(self):
         return self._figure
 
-    def _set_figure(self, figure):
+    @figure.setter
+    def figure(self, figure):
+        if hasattr(self, '_figure'):
+            raise NotImplementedError
+
         if not figure.canvas:
             self._backend.FigureCanvas(figure, manager=self)
         self._figure = figure