python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-04-28 13:03:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1519 from mattip/master

Browse Source 
test, fix missing 'version' key value in __array_interface__
This commit is contained in:
wiredfool 2015-11-18 09:39:34 +00:00
commit 35296ca155
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PIL/Image.py
View File

@ -622,6 +622,7 @@ class Image(object):
new['shape'] = shape new['shape'] = shape
new['typestr'] = typestr new['typestr'] = typestr
new['data'] = self.tobytes() new['data'] = self.tobytes()
new['version'] = 3
return new return new
raise AttributeError(name) raise AttributeError(name)

16
Tests/test_image_array.py
View File

@ -10,18 +10,18 @@ class TestImageArray(PillowTestCase):
def test_toarray(self): def test_toarray(self):
def test(mode): def test(mode):
ai = im.convert(mode).__array_interface__ ai = im.convert(mode).__array_interface__
return ai["shape"], ai["typestr"], len(ai["data"]) return ai['version'], ai["shape"], ai["typestr"], len(ai["data"])
# self.assertEqual(test("1"), ((100, 128), '|b1', 1600)) # self.assertEqual(test("1"), (3, (100, 128), '|b1', 1600))
self.assertEqual(test("L"), ((100, 128), '|u1', 12800)) self.assertEqual(test("L"), (3, (100, 128), '|u1', 12800))
# FIXME: wrong? # 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? # 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("RGB"), (3, (100, 128, 3), '|u1', 38400))
self.assertEqual(test("RGBA"), ((100, 128, 4), '|u1', 51200)) self.assertEqual(test("RGBA"), (3, (100, 128, 4), '|u1', 51200))
self.assertEqual(test("RGBX"), ((100, 128, 4), '|u1', 51200)) self.assertEqual(test("RGBX"), (3, (100, 128, 4), '|u1', 51200))
def test_fromarray(self): def test_fromarray(self):
def test(mode): def test(mode):