Skip to content

Commit

Permalink
Make it compatible with Pillow10
Browse files Browse the repository at this point in the history
  • Loading branch information
vstoykov committed Sep 26, 2023
1 parent 1aef037 commit 0678c5f
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 12 deletions.
31 changes: 31 additions & 0 deletions pilkit/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,34 @@
string_types = [basestring, str]
except NameError:
string_types = [str]


def getattrsafe(obj, attr, fallback_attr = None):
"""Similar to getattr but accept dotted path
The idea of this function is to pass dotted path to attribute.
If the path is missing then the fallback will be evaluated as dotted path also.
If the fallback is not present then the attribute error for the first path is thrown
The main idea of this function is for compatibility with Pillow < 10
Example::
>>> from PIL import Image
>>> getattrsafe(Image, 'Transpose.FLIP_HORIZONTAL', 'FLIP_HORIZONTAL')
"""
names = attr.split('.')
res = obj
for i, name in enumerate(names):
try:
res = getattr(res, name)
except AttributeError:
missing = names[:i + 1].join('.')
if fallback_attr is None:
raise AttributeError("'{}' object has no attribute '{}'".format(type(obj).__name__, missing))
else:
try:
return getattrsafe(obj, fallback_attr)
except AttributeError:
raise AttributeError("'{}' object has no attribute '{}' or '{}'".format(type(obj).__name__, missing, fallback_attr))
return res
14 changes: 7 additions & 7 deletions pilkit/processors/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pilkit.lib import Image, ImageColor, ImageEnhance
from pilkit.lib import Image, ImageColor, ImageEnhance, getattrsafe


class ProcessorPipeline(list):
Expand Down Expand Up @@ -80,7 +80,7 @@ def process(self, img):
# Handle palleted images.
img = img.convert('RGBA')
# Copy orignial image and flip the orientation.
reflection = img.copy().transpose(Image.FLIP_TOP_BOTTOM)
reflection = img.copy().transpose(Transpose.FLIP_VERTICAL)
# Create a new image filled with the bgcolor the same size.
background = Image.new("RGBA", img.size, background_color)
# Calculate our alpha mask.
Expand Down Expand Up @@ -116,11 +116,11 @@ class Transpose(object):
"""
AUTO = 'auto'
FLIP_HORIZONTAL = Image.FLIP_LEFT_RIGHT
FLIP_VERTICAL = Image.FLIP_TOP_BOTTOM
ROTATE_90 = Image.ROTATE_90
ROTATE_180 = Image.ROTATE_180
ROTATE_270 = Image.ROTATE_270
FLIP_HORIZONTAL = getattrsafe(Image, 'Transpose.FLIP_LEFT_RIGHT', 'FLIP_LEFT_RIGHT') # noqa
FLIP_VERTICAL = getattrsafe(Image, 'Transpose.FLIP_TOP_BOTTOM', 'FLIP_TOP_BOTTOM') # noqa
ROTATE_90 = getattrsafe(Image, 'Transpose.ROTATE_90', 'ROTATE_90')
ROTATE_180 = getattrsafe(Image, 'Transpose.ROTATE_180', 'ROTATE_180')
ROTATE_270 = getattrsafe(Image, 'Transpose.ROTATE_270', 'ROTATE_270')

methods = [AUTO]
_EXIF_ORIENTATION_STEPS = {
Expand Down
4 changes: 3 additions & 1 deletion pilkit/processors/resize.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class Resize(object):
Resizes an image to the specified width and height.
"""
LANCZOS = getattr(Image, 'Resampling.LANCZOS', 'LANCZOS')

def __init__(self, width, height, upscale=True):
"""
:param width: The target width, in pixels.
Expand All @@ -22,7 +24,7 @@ def __init__(self, width, height, upscale=True):
def process(self, img):
if self.upscale or (self.width < img.size[0] and self.height < img.size[1]):
img = resolve_palette(img)
img = img.resize((self.width, self.height), Image.LANCZOS)
img = img.resize((self.width, self.height), self.LANCZOS)
return img


Expand Down
9 changes: 5 additions & 4 deletions pilkit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys
from io import UnsupportedOperation
from .exceptions import UnknownExtension, UnknownFormat
from .lib import Image, ImageFile, StringIO, string_types
from .lib import Image, ImageFile, StringIO, string_types, getattrsafe


RGBA_TRANSPARENCY_FORMATS = ['PNG', 'WEBP']
Expand Down Expand Up @@ -311,8 +311,8 @@ def prepare_image(img, format):

alpha = img.split()[-1]
mask = Image.eval(alpha, lambda a: 255 if a <= 128 else 0)
img = img.convert('RGB').convert('P', palette=Image.ADAPTIVE,
colors=255)
palette = getattrsafe(Image, 'Palette.ADAPTIVE', 'ADAPTIVE')
img = img.convert('RGB').convert('P', palette=palette, colors=255)
img.paste(255, mask)
save_kwargs['transparency'] = 255
else:
Expand Down Expand Up @@ -344,7 +344,8 @@ def prepare_image(img, format):
# quantization (above). Images that are already in P mode don't need
# any quantization because their colors are already limited.
if format == 'GIF':
img = img.convert('P', palette=Image.ADAPTIVE)
palette = getattrsafe(Image, 'Palette.ADAPTIVE', 'ADAPTIVE')
img = img.convert('P', palette=palette)

if make_opaque:
from .processors import MakeOpaque
Expand Down

0 comments on commit 0678c5f

Please sign in to comment.