From 695139eca58ac2e904aa6c36193156bcc08101e3 2012-09-06 06:13:08
From: Jens H. Nielsen <jenshnielsen@gmail.com>
Date: 2012-09-06 06:13:08
Subject: [PATCH] Provide default figure canvas for inline backend needed due to matplotlib
change.

Conflicts:

	IPython/zmq/pylab/backend_inline.py

---

diff --git a/IPython/zmq/pylab/backend_inline.py b/IPython/zmq/pylab/backend_inline.py
index 0058284..921d37e 100644
--- a/IPython/zmq/pylab/backend_inline.py
+++ b/IPython/zmq/pylab/backend_inline.py
@@ -10,7 +10,7 @@ import sys
 
 # Third-party imports
 import matplotlib
-from matplotlib.backends.backend_agg import new_figure_manager
+from matplotlib.backends.backend_agg import new_figure_manager, FigureCanvasAgg
 from matplotlib._pylab_helpers import Gcf
 
 # Local imports.
@@ -207,3 +207,6 @@ def flush_figures():
         show._to_draw = []
         show._draw_called = False
 
+
+FigureCanvas = FigureCanvasAgg
+