Merge pull request #1680 from radarhere/asserts

Updated deprecated asserts
python-pillow · Jan 24, 2016 · 3d6e137 · 3d6e137
2 parents ee76e8a + 0ad6f5f
commit 3d6e137
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
@@ -85,8 +85,8 @@ def test_xyres_tiff(self):
         self.assertIsInstance(im.tag[Y_RESOLUTION][0], tuple)
 
         #v2 api
-        self.assert_(isinstance(im.tag_v2[X_RESOLUTION], TiffImagePlugin.IFDRational))
-        self.assert_(isinstance(im.tag_v2[Y_RESOLUTION], TiffImagePlugin.IFDRational))
+        self.assertIsInstance(im.tag_v2[X_RESOLUTION], TiffImagePlugin.IFDRational)
+        self.assertIsInstance(im.tag_v2[Y_RESOLUTION], TiffImagePlugin.IFDRational)
 
         self.assertEqual(im.info['dpi'], (72., 72.))
 

diff --git a/Tests/test_tiff_ifdrational.py b/Tests/test_tiff_ifdrational.py
@@ -11,14 +11,14 @@ class Test_IFDRational(PillowTestCase):
 
 
     def _test_equal(self, num, denom, target):
-        
+
         t = IFDRational(num, denom)
 
         self.assertEqual(target, t)
         self.assertEqual(t, target)
-    
+
     def test_sanity(self):
-        
+
         self._test_equal(1, 1, 1)
         self._test_equal(1, 1, Fraction(1,1))
 
@@ -27,29 +27,29 @@ def test_sanity(self):
 
         self._test_equal(Fraction(1,1), 1, Fraction(1,1))
         self._test_equal(IFDRational(1,1), 1, 1)
-        
-        
+
+
         self._test_equal(1, 2, Fraction(1,2))
         self._test_equal(1, 2, IFDRational(1,2))
 
     def test_nonetype(self):
-        " Fails if the _delegate function doesn't return a valid function" 
+        " Fails if the _delegate function doesn't return a valid function"
+
+        xres = IFDRational(72)
+        yres = IFDRational(72)
+        self.assertTrue(xres._val is not None)
+        self.assertTrue(xres.numerator is not None)
+        self.assertTrue(xres.denominator is not None)
+        self.assertTrue(yres._val is not None)
 
-        xres = IFDRational(72) 
-        yres = IFDRational(72) 
-        self.assert_(xres._val is not None)
-        self.assert_(xres.numerator is not None)
-        self.assert_(xres.denominator is not None)
-        self.assert_(yres._val is not None)
-
-        self.assert_(xres and 1)
-        self.assert_(xres and yres)
+        self.assertTrue(xres and 1)
+        self.assertTrue(xres and yres)
 
 
     def test_ifd_rational_save(self):
         for libtiff in (True, False):
             TiffImagePlugin.WRITE_LIBTIFF = libtiff
-            
+
             im = hopper()
             out = self.tempfile('temp.tiff')
             res = IFDRational(301,1)