mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-10-31 16:07:30 +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.
53 lines
1.1 KiB
Python
53 lines
1.1 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# Binary input/output support routines.
|
|
#
|
|
# Copyright (c) 1997-2003 by Secret Labs AB
|
|
# Copyright (c) 1995-2003 by Fredrik Lundh
|
|
# Copyright (c) 2012 by Brian Crowell
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
if bytes is str:
|
|
def i8(c):
|
|
return ord(c)
|
|
|
|
def o8(i):
|
|
return chr(i&255)
|
|
else:
|
|
def i8(c):
|
|
return c if c.__class__ is int else c[0]
|
|
|
|
def o8(i):
|
|
return bytes((i&255,))
|
|
|
|
# Input, le = little endian, be = big endian
|
|
def i16le(c, o=0):
|
|
return i8(c[o]) | (i8(c[o+1])<<8)
|
|
|
|
def i32le(c, o=0):
|
|
return i8(c[o]) | (i8(c[o+1])<<8) | (i8(c[o+2])<<16) | (i8(c[o+3])<<24)
|
|
|
|
def i16be(c, o=0):
|
|
return (i8(c[o])<<8) | i8(c[o+1])
|
|
|
|
def i32be(c, o=0):
|
|
return (i8(c[o])<<24) | (i8(c[o+1])<<16) | (i8(c[o+2])<<8) | i8(c[o+3])
|
|
|
|
# Output, le = little endian, be = big endian
|
|
def o16le(i):
|
|
return o8(i) + o8(i>>8)
|
|
|
|
def o32le(i):
|
|
return o8(i) + o8(i>>8) + o8(i>>16) + o8(i>>24)
|
|
|
|
def o16be(i):
|
|
return o8(i>>8) + o8(i)
|
|
|
|
def o32be(i):
|
|
return o8(i>>24) + o8(i>>16) + o8(i>>8) + o8(i)
|
|
|