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

Fix python 3 bytes to string concat error

Browse Source
This commit is contained in:
Konstantin Kopachev 2016-06-29 13:01:37 -07:00
parent c3b970f046
commit 885297d21f
No known key found for this signature in database
GPG Key ID: CECF757E656F4F62
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PIL/PngImagePlugin.py
View File

@ -140,7 +140,7 @@ class ChunkStream(object):
# Skip CRC checks for ancillary chunks if allowed to load truncated images # Skip CRC checks for ancillary chunks if allowed to load truncated images
# 5th byte of first char is 1 [specs, section 5.4] # 5th byte of first char is 1 [specs, section 5.4]
if ImageFile.LOAD_TRUNCATED_IMAGES and (ord(cid[0]) >> 5 & 1): if ImageFile.LOAD_TRUNCATED_IMAGES and (i8(cid[0]) >> 5 & 1):
self.crc_skip(cid, data) self.crc_skip(cid, data)
return return

4
Tests/test_file_png.py
View File

@ -324,7 +324,7 @@ class TestFilePng(PillowTestCase):
# check ignores crc errors in ancillary chunks # check ignores crc errors in ancillary chunks
chunk_data = chunk(b'tEXt', b'spam') chunk_data = chunk(b'tEXt', b'spam')
broken_crc_chunk_data = chunk_data[:-1] + 'q' # break CRC broken_crc_chunk_data = chunk_data[:-1] + b'q' # break CRC
image_data = HEAD + broken_crc_chunk_data + TAIL image_data = HEAD + broken_crc_chunk_data + TAIL
self.assertRaises(SyntaxError, self.assertRaises(SyntaxError,
@ -340,7 +340,7 @@ class TestFilePng(PillowTestCase):
def test_verify_not_ignores_crc_error_in_required_chunk(self): def test_verify_not_ignores_crc_error_in_required_chunk(self):
# check does not ignore crc errors in required chunks # check does not ignore crc errors in required chunks
image_data = MAGIC + IHDR[:-1] + 'q' + TAIL image_data = MAGIC + IHDR[:-1] + b'q' + TAIL
ImageFile.LOAD_TRUNCATED_IMAGES = True ImageFile.LOAD_TRUNCATED_IMAGES = True
try: try: