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.
57 lines
1.2 KiB
Python
57 lines
1.2 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# read files from within a tar file
|
|
#
|
|
# History:
|
|
# 95-06-18 fl Created
|
|
# 96-05-28 fl Open files in binary mode
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997.
|
|
# Copyright (c) Fredrik Lundh 1995-96.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
from . import ContainerIO
|
|
|
|
##
|
|
# A file object that provides read access to a given member of a TAR
|
|
# file.
|
|
|
|
class TarIO(ContainerIO.ContainerIO):
|
|
|
|
##
|
|
# Create file object.
|
|
#
|
|
# @param tarfile Name of TAR file.
|
|
# @param file Name of member file.
|
|
|
|
def __init__(self, tarfile, file):
|
|
|
|
fh = open(tarfile, "rb")
|
|
|
|
while True:
|
|
|
|
s = fh.read(512)
|
|
if len(s) != 512:
|
|
raise IOError("unexpected end of tar file")
|
|
|
|
name = s[:100].decode('utf-8')
|
|
i = name.find(b'\0')
|
|
if i == 0:
|
|
raise IOError("cannot find subfile")
|
|
if i > 0:
|
|
name = name[:i]
|
|
|
|
size = int(s[124:136], 8)
|
|
|
|
if file == name:
|
|
break
|
|
|
|
fh.seek((size + 511) & (~511), 1)
|
|
|
|
# Open region
|
|
ContainerIO.ContainerIO.__init__(self, fh, fh.tell(), size)
|