mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-26 01:46: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.
69 lines
1.5 KiB
Python
69 lines
1.5 KiB
Python
#
|
|
# The Python Imaging Library
|
|
# $Id$
|
|
#
|
|
# GRIB stub adapter
|
|
#
|
|
# Copyright (c) 1996-2003 by Fredrik Lundh
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
from . import Image, ImageFile
|
|
|
|
_handler = None
|
|
|
|
##
|
|
# Install application-specific GRIB image handler.
|
|
#
|
|
# @param handler Handler object.
|
|
|
|
def register_handler(handler):
|
|
global _handler
|
|
_handler = handler
|
|
|
|
# --------------------------------------------------------------------
|
|
# Image adapter
|
|
|
|
def _accept(prefix):
|
|
return prefix[0:4] == b"GRIB" and prefix[7] == b'\x01'
|
|
|
|
class GribStubImageFile(ImageFile.StubImageFile):
|
|
|
|
format = "GRIB"
|
|
format_description = "GRIB"
|
|
|
|
def _open(self):
|
|
|
|
offset = self.fp.tell()
|
|
|
|
if not _accept(self.fp.read(8)):
|
|
raise SyntaxError("Not a GRIB file")
|
|
|
|
self.fp.seek(offset)
|
|
|
|
# make something up
|
|
self.mode = "F"
|
|
self.size = 1, 1
|
|
|
|
loader = self._load()
|
|
if loader:
|
|
loader.open(self)
|
|
|
|
def _load(self):
|
|
return _handler
|
|
|
|
def _save(im, fp, filename):
|
|
if _handler is None or not hasattr("_handler", "save"):
|
|
raise IOError("GRIB save handler not installed")
|
|
_handler.save(im, fp, filename)
|
|
|
|
|
|
# --------------------------------------------------------------------
|
|
# Registry
|
|
|
|
Image.register_open(GribStubImageFile.format, GribStubImageFile, _accept)
|
|
Image.register_save(GribStubImageFile.format, _save)
|
|
|
|
Image.register_extension(GribStubImageFile.format, ".grib")
|