From d8a2271d19e45ae4daf2ecd57cbd290eb9ed00ae Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 17 Dec 2015 09:11:23 +1100 Subject: [PATCH 1/2] Updated deprecated assert --- Tests/test_file_tiff_metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index b0f4e402a..6d6092dc3 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -154,7 +154,7 @@ class TestFileTiffMetadata(PillowTestCase): im.save(out) reloaded = Image.open(out) - self.assert_(type(im.info['icc_profile']) is not type(tuple)) + self.assertNotIsInstance(im.info['icc_profile'], tuple) self.assertEqual(im.info['icc_profile'], reloaded.info['icc_profile']) def test_iccprofile_binary(self): From 0ac4903cb9e696221e3fe8675f80f934298fe611 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 25 Dec 2015 16:41:36 +1100 Subject: [PATCH 2/2] Fixed failing test --- PIL/TiffImagePlugin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py index 298c48759..b28230532 100644 --- a/PIL/TiffImagePlugin.py +++ b/PIL/TiffImagePlugin.py @@ -860,7 +860,10 @@ class TiffImageFile(ImageFile.ImageFile): self.decoderconfig = (self.tag_v2[PREDICTOR],) if ICCPROFILE in self.tag_v2: - self.info['icc_profile'] = self.tag_v2[ICCPROFILE] + iccprofile = self.tag_v2[ICCPROFILE] + if len(iccprofile) == 1: + iccprofile = iccprofile[0] + self.info['icc_profile'] = iccprofile return args