From 3c0a00d069a6e472ac8a9c44059c328e794cf421 2015-10-28 09:18:31
From: Min RK <benjaminrk@gmail.com>
Date: 2015-10-28 09:18:31
Subject: [PATCH] fix instantiation of shell in test_inline_twice

test was failing because get_ipython() returns an instance where inline backend doesn't make sense.
---

diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index df23f08..67c45d2 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -1,16 +1,9 @@
 """Tests for pylab tools module.
 """
-#-----------------------------------------------------------------------------
-# Copyright (c) 2011, the IPython Development Team.
-#
+
+# Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
 from __future__ import print_function
 
 from io import UnsupportedOperation, BytesIO
@@ -25,7 +18,6 @@ import nose.tools as nt
 from matplotlib import pyplot as plt
 import numpy as np
 
-# Our own imports
 from IPython.core.getipython import get_ipython
 from IPython.core.interactiveshell import InteractiveShell
 from IPython.core.display import _PNG, _JPEG
@@ -33,17 +25,6 @@ from .. import pylabtools as pt
 
 from IPython.testing import decorators as dec
 
-#-----------------------------------------------------------------------------
-# Globals and constants
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Local utilities
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Classes and functions
-#-----------------------------------------------------------------------------
 
 def test_figure_to_svg():
     # simple empty-figure test
@@ -232,7 +213,7 @@ class TestPylabSwitch(object):
     def test_inline_twice(self):
         "Using '%matplotlib inline' twice should not reset formatters"
 
-        ip = get_ipython()
+        ip = self.Shell()
         gui, backend = ip.enable_matplotlib('inline')
         nt.assert_equal(gui, 'inline')