Fix for Py 2.6: some nose function did not exist

Mrngilles · Mrngilles · commit 8d75a75e3f7a · 2015-07-21T21:49:39.000+02:00
diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py
@@ -8,8 +8,7 @@
 from contextlib import contextmanager
 
 from nose import SkipTest
-from nose.tools import (assert_raises, assert_equal, assert_is_not,
-                        assert_is_instance)
+from nose.tools import assert_raises, assert_equal
 
 import matplotlib as mpl
 from matplotlib import style
@@ -142,7 +141,7 @@ def test_context_with_badparam():
 
 def test_get_style_dict():
     style_dict = get_style_dict('bmh')
-    assert_is_instance(style_dict, dict)
+    assert(isinstance(style_dict, dict))
 
 
 def test_get_style_dict_from_lib():
@@ -215,13 +214,13 @@ def test_no_parent():
     flattened = flatten_inheritance_dict(child, 'parents')
     assert_equal(flattened, child)
     # Verify that flatten_inheritance_dict always returns a copy.
-    assert_is_not(flattened, child)
+    assert(flattened is not child)
 
 
 def test_non_list_raises():
     child = {'parents': 'parent-value'}
-    with assert_raises(ValueError):
-        flatten_inheritance_dict(child, 'parents')
+    assert_raises(ValueError, flatten_inheritance_dict, child,
+                  'parents')
 
 
 def test_child_with_no_unique_values():
@@ -278,9 +277,8 @@ def expand_parent(key):
         return parent_map[key]
 
     child = {'parents': ['a-pointer']}
-    with assert_raises(RuntimeError):
-        flatten_inheritance_dict(child, 'parents',
-                                 expand_parent=expand_parent)
+    assert_raises(RuntimeError, flatten_inheritance_dict, child,
+                 'parents', expand_parent=expand_parent)
 
 
 if __name__ == '__main__':
