Skip to content

Commit f542f36

Browse files
author
Ben Cipollini
committed
BF: can't use assert_raises as context (py2.6)
1 parent 017f7e5 commit f542f36

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

nibabel/gifti/tests/test_gifti.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ def test_labeltable():
7979
assert_equal(len(img.labeltable.labels), 2)
8080

8181
# Try to set to non-table
82-
with assert_raises(ValueError):
83-
img.labeltable = 'not-a-table'
82+
def assign_labeltable(val):
83+
img.labeltable = val
84+
assert_raises(ValueError, assign_labeltable, 'not-a-table')
8485

8586

8687
def test_metadata():
@@ -112,10 +113,10 @@ def test_gifti_label_rgba():
112113
assert_equal(kwargs['blue'], gl.rgba[2])
113114
assert_equal(kwargs['alpha'], gl.rgba[3])
114115

115-
with assert_raises(ValueError):
116-
gl.rgba = rgba[:2]
117-
with assert_raises(ValueError):
118-
gl.rgba = rgba.tolist() + rgba.tolist()
116+
def assign_rgba(val):
117+
gl.rgba = val
118+
assert_raises(ValueError, assign_rgba, rgba[:2])
119+
assert_raises(ValueError, assign_rgba, rgba.tolist() + rgba.tolist())
119120

120121
# Test deprecation
121122
with clear_and_catch_warnings() as w:

0 commit comments

Comments
 (0)