From 0ff05afa56a10d62c02ca947cf6c65db41c27cf3 Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 2 Nov 2015 20:07:12 +0200 Subject: [PATCH] test, fix missing 'version' key value in __array_interface__ --- PIL/Image.py | 1 + Tests/test_image_array.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/PIL/Image.py b/PIL/Image.py index fc028f71e..caa66ea0d 100644 --- a/PIL/Image.py +++ b/PIL/Image.py @@ -622,6 +622,7 @@ class Image(object): new['shape'] = shape new['typestr'] = typestr new['data'] = self.tobytes() + new['version'] = 3 return new raise AttributeError(name) diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py index 0899afd02..ce8cbe78c 100644 --- a/Tests/test_image_array.py +++ b/Tests/test_image_array.py @@ -10,18 +10,18 @@ class TestImageArray(PillowTestCase): def test_toarray(self): def test(mode): ai = im.convert(mode).__array_interface__ - return ai["shape"], ai["typestr"], len(ai["data"]) - # self.assertEqual(test("1"), ((100, 128), '|b1', 1600)) - self.assertEqual(test("L"), ((100, 128), '|u1', 12800)) + return ai['version'], ai["shape"], ai["typestr"], len(ai["data"]) + # self.assertEqual(test("1"), (3, (100, 128), '|b1', 1600)) + self.assertEqual(test("L"), (3, (100, 128), '|u1', 12800)) # FIXME: wrong? - self.assertEqual(test("I"), ((100, 128), Image._ENDIAN + 'i4', 51200)) + self.assertEqual(test("I"), (3, (100, 128), Image._ENDIAN + 'i4', 51200)) # FIXME: wrong? - self.assertEqual(test("F"), ((100, 128), Image._ENDIAN + 'f4', 51200)) + self.assertEqual(test("F"), (3, (100, 128), Image._ENDIAN + 'f4', 51200)) - self.assertEqual(test("RGB"), ((100, 128, 3), '|u1', 38400)) - self.assertEqual(test("RGBA"), ((100, 128, 4), '|u1', 51200)) - self.assertEqual(test("RGBX"), ((100, 128, 4), '|u1', 51200)) + self.assertEqual(test("RGB"), (3, (100, 128, 3), '|u1', 38400)) + self.assertEqual(test("RGBA"), (3, (100, 128, 4), '|u1', 51200)) + self.assertEqual(test("RGBX"), (3, (100, 128, 4), '|u1', 51200)) def test_fromarray(self): def test(mode):