From 4c526963a471b94184aaa38365a9ed3609b9536a Mon Sep 17 00:00:00 2001
From: Lorenz Schori <lo@znerol.ch>
Date: Sat, 16 Apr 2016 14:57:20 +0100
Subject: [PATCH] Revert a14467f fixes #1462 again

---
 PIL/TiffImagePlugin.py           | 2 ++
 PIL/TiffTags.py                  | 2 +-
 Tests/test_file_tiff_metadata.py | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py
index 99beb0f97..dd8071156 100644
--- a/PIL/TiffImagePlugin.py
+++ b/PIL/TiffImagePlugin.py
@@ -554,6 +554,8 @@ class ImageFileDirectory_v2(collections.MutableMapping):
         if info.length == 1:
             if legacy_api and self.tagtype[tag] in [5, 10]:
                 values = values,
+            elif not legacy_api and self.tagtype[tag] == 1:
+                values = values,
             dest[tag], = values
         else:
             dest[tag] = values
diff --git a/PIL/TiffTags.py b/PIL/TiffTags.py
index bee921dcd..04b78ae4e 100644
--- a/PIL/TiffTags.py
+++ b/PIL/TiffTags.py
@@ -152,7 +152,7 @@ TAGS_V2 = {
 
     # FIXME add more tags here
     34665: ("ExifIFD", SHORT, 1),
-    34675: ('ICCProfile', 7, 0),
+    34675: ('ICCProfile', 7, 1),
     34853: ('GPSInfoIFD', 1, 1),
 
     # MPInfo
diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py
index fa93b5f08..c186162b1 100644
--- a/Tests/test_file_tiff_metadata.py
+++ b/Tests/test_file_tiff_metadata.py
@@ -175,7 +175,7 @@ class TestFileTiffMetadata(PillowTestCase):
 
         im.save(out)
         reloaded = Image.open(out)
-        self.assert_(type(im.info['icc_profile']) is not type(tuple))
+        self.assertNotEqual(type(im.info['icc_profile']), tuple)
         self.assertEqual(im.info['icc_profile'], reloaded.info['icc_profile'])
 
     def test_iccprofile_binary(self):