Converted context-based tests to non-context-based tests for the v1.5.x branch

WeatherGod · WeatherGod · commit 3b01f59de9dc · 2015-11-10T14:31:54.000-05:00
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -150,18 +150,14 @@ def test_valid_input_forms():
 @cleanup
 def test_invalid_input_forms():
     fig, ax = plt.subplots()
-    with assert_raises((TypeError, ValueError)):
-        ax.set_prop_cycle(1)
-    with assert_raises((TypeError, ValueError)):
-        ax.set_prop_cycle([1, 2])
-    with assert_raises((TypeError, ValueError)):
-        ax.set_prop_cycle('color', 'fish')
-    with assert_raises((TypeError, ValueError)):
-        ax.set_prop_cycle('linewidth', 1)
-    with assert_raises((TypeError, ValueError)):
-        ax.set_prop_cycle('linewidth', {'1': 1, '2': 2})
-    with assert_raises((TypeError, ValueError)):
-        ax.set_prop_cycle(linewidth=1, color='r')
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle, 1)
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle, [1, 2])
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle, 'color', 'fish')
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle, 'linewidth', 1)
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle,
+            'linewidth', {'1': 1, '2': 2})
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle,
+            linewidth=1, color='r')
 
 
 if __name__ == '__main__':
