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

Merge pull request #1095 from hugovk/pickle_L_mode

Browse Source 
Fix pickling L mode images with no palette
This commit is contained in:
wiredfool 2015-01-30 11:39:50 -08:00
commit d80c27dc3f
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PIL/Image.py
View File

@ -635,7 +635,7 @@ class Image:
self.mode = mode self.mode = mode
self.size = size self.size = size
self.im = core.new(mode, size) self.im = core.new(mode, size)
if mode in ("L", "P"): if mode in ("L", "P") and palette:
self.putpalette(palette) self.putpalette(palette)
self.frombytes(data) self.frombytes(data)

30
Tests/test_pickle.py
View File

@ -5,10 +5,12 @@ from PIL import Image
class TestPickle(PillowTestCase): class TestPickle(PillowTestCase):
def helper_pickle_file(self, pickle, protocol=0): def helper_pickle_file(self, pickle, protocol=0, mode=None):
# Arrange # Arrange
im = Image.open('Tests/images/hopper.jpg') im = Image.open('Tests/images/hopper.jpg')
filename = self.tempfile('temp.pkl') filename = self.tempfile('temp.pkl')
if mode:
im = im.convert(mode)
# Act # Act
with open(filename, 'wb') as f: with open(filename, 'wb') as f:
@ -19,9 +21,11 @@ class TestPickle(PillowTestCase):
# Assert # Assert
self.assertEqual(im, loaded_im) self.assertEqual(im, loaded_im)
def helper_pickle_string( def helper_pickle_string(self, pickle, protocol=0,
self, pickle, protocol=0, file='Tests/images/hopper.jpg'): file='Tests/images/hopper.jpg', mode=None):
im = Image.open(file) im = Image.open(file)
if mode:
im = im.convert(mode)
# Act # Act
dumped_string = pickle.dumps(im, protocol) dumped_string = pickle.dumps(im, protocol)
@ -67,6 +71,26 @@ class TestPickle(PillowTestCase):
]: ]:
self.helper_pickle_string(pickle, file=file) self.helper_pickle_string(pickle, file=file)
def test_pickle_l_mode(self):
# Arrange
import pickle
# Act / Assert
for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
self.helper_pickle_string(pickle, protocol, mode="L")
self.helper_pickle_file(pickle, protocol, mode="L")
def test_cpickle_l_mode(self):
# Arrange
try:
import cPickle
except ImportError:
return
# Act / Assert
for protocol in range(0, cPickle.HIGHEST_PROTOCOL + 1):
self.helper_pickle_string(cPickle, protocol, mode="L")
self.helper_pickle_file(cPickle, protocol, mode="L")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()