progress, no more deprecation warnings?

This commit is contained in:
John Evans 2014-11-19 09:22:40 -05:00
commit 3c73415090

View file

@ -340,6 +340,7 @@ class TestJp2k(unittest.TestCase):
self.assertEqual(newjp2.mode, 'rb') self.assertEqual(newjp2.mode, 'rb')
self.assertEqual(len(newjp2.box), 0) self.assertEqual(len(newjp2.box), 0)
@unittest.skip("see issue 302")
def test_rlevel_max(self): def test_rlevel_max(self):
"""Verify that rlevel=-1 gets us the lowest resolution image""" """Verify that rlevel=-1 gets us the lowest resolution image"""
j = Jp2k(self.j2kfile) j = Jp2k(self.j2kfile)
@ -352,7 +353,7 @@ class TestJp2k(unittest.TestCase):
"""Should error out appropriately if reduce level too high""" """Should error out appropriately if reduce level too high"""
j = Jp2k(self.jp2file) j = Jp2k(self.jp2file)
with self.assertRaises(IOError): with self.assertRaises(IOError):
j.read(rlevel=6) j[::64, ::64]
def test_not_jpeg2000(self): def test_not_jpeg2000(self):
"""Should error out appropriately if not given a JPEG 2000 file.""" """Should error out appropriately if not given a JPEG 2000 file."""
@ -849,8 +850,11 @@ class TestJp2k_1_x(unittest.TestCase):
""" """
with patch('glymur.version.openjpeg_version_tuple', new=(1, 5, 0)): with patch('glymur.version.openjpeg_version_tuple', new=(1, 5, 0)):
j2k = Jp2k(self.j2kfile) j2k = Jp2k(self.j2kfile)
with self.assertRaises(TypeError): with warnings.catch_warnings():
j2k.read(tile=0) # The tile keyword is deprecated, so suppress the warning.
warnings.simplefilter('ignore')
with self.assertRaises(TypeError):
j2k.read(tile=0)
def test_layer(self): def test_layer(self):
"""layer option not allowed for 1.x. """layer option not allowed for 1.x.