mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-26 18:06:18 +03:00
a7e3b2e47b
There are two main issues fixed with this commit: * bytes vs. str: All file, image, and palette data are now handled as bytes. A new _binary module consolidates the hacks needed to do this across Python versions. tostring/fromstring methods have been renamed to tobytes/frombytes, but the Python 2.6/2.7 versions alias them to the old names for compatibility. Users should move to tobytes/frombytes. One other potentially-breaking change is that text data in image files (such as tags, comments) are now explicitly handled with a specific character encoding in mind. This works well with the Unicode str in Python 3, but may trip up old code expecting a straight byte-for-byte translation to a Python string. This also required a change to Gohlke's tags tests (in Tests/test_file_png.py) to expect Unicode strings from the code. * True div vs. floor div: Many division operations used the "/" operator to do floor division, which is now the "//" operator in Python 3. These were fixed. As of this commit, on the first pass, I have one failing test (improper handling of a slice object in a C module, test_imagepath.py) in Python 3, and three that that I haven't tried running yet (test_imagegl, test_imagegrab, and test_imageqt). I also haven't tested anything on Windows. All but the three skipped tests run flawlessly against Pythons 2.6 and 2.7.
63 lines
1.3 KiB
Python
63 lines
1.3 KiB
Python
#
|
|
# Python Imaging Library
|
|
# $Id$
|
|
#
|
|
# stuff to read GIMP palette files
|
|
#
|
|
# History:
|
|
# 1997-08-23 fl Created
|
|
# 2004-09-07 fl Support GIMP 2.0 palette files.
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997-2004. All rights reserved.
|
|
# Copyright (c) Fredrik Lundh 1997-2004.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
import re
|
|
from ._binary import o8
|
|
|
|
##
|
|
# File handler for GIMP's palette format.
|
|
|
|
class GimpPaletteFile:
|
|
|
|
rawmode = "RGB"
|
|
|
|
def __init__(self, fp):
|
|
|
|
self.palette = [o8(i)*3 for i in range(256)]
|
|
|
|
if fp.readline()[:12] != b"GIMP Palette":
|
|
raise SyntaxError("not a GIMP palette file")
|
|
|
|
i = 0
|
|
|
|
while i <= 255:
|
|
|
|
s = fp.readline()
|
|
|
|
if not s:
|
|
break
|
|
# skip fields and comment lines
|
|
if re.match(b"\w+:|#", s):
|
|
continue
|
|
if len(s) > 100:
|
|
raise SyntaxError("bad palette file")
|
|
|
|
v = tuple(map(int, s.split()[:3]))
|
|
if len(v) != 3:
|
|
raise ValueError("bad palette entry")
|
|
|
|
if 0 <= i <= 255:
|
|
self.palette[i] = o8(v[0]) + o8(v[1]) + o8(v[2])
|
|
|
|
i = i + 1
|
|
|
|
self.palette = b"".join(self.palette)
|
|
|
|
|
|
def getpalette(self):
|
|
|
|
return self.palette, self.rawmode
|