mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-09-21 19:38:57 +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.
56 lines
1.1 KiB
Python
56 lines
1.1 KiB
Python
#
|
|
# Python Imaging Library
|
|
# $Id$
|
|
#
|
|
# stuff to read simple, teragon-style palette files
|
|
#
|
|
# History:
|
|
# 97-08-23 fl Created
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997.
|
|
# Copyright (c) Fredrik Lundh 1997.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
from ._binary import o8
|
|
|
|
##
|
|
# File handler for Teragon-style palette files.
|
|
|
|
class PaletteFile:
|
|
|
|
rawmode = "RGB"
|
|
|
|
def __init__(self, fp):
|
|
|
|
self.palette = [(i, i, i) for i in range(256)]
|
|
|
|
while True:
|
|
|
|
s = fp.readline()
|
|
|
|
if not s:
|
|
break
|
|
if s[0:1] == b"#":
|
|
continue
|
|
if len(s) > 100:
|
|
raise SyntaxError("bad palette file")
|
|
|
|
v = [int(x) for x in s.split()]
|
|
try:
|
|
[i, r, g, b] = v
|
|
except ValueError:
|
|
[i, r] = v
|
|
g = b = r
|
|
|
|
if 0 <= i <= 255:
|
|
self.palette[i] = o8(r) + o8(g) + o8(b)
|
|
|
|
self.palette = b"".join(self.palette)
|
|
|
|
|
|
def getpalette(self):
|
|
|
|
return self.palette, self.rawmode
|