From 877da3de95fe7dd956d90452934aeb9c183e5713 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 23 Mar 2015 17:14:07 +0000 Subject: [PATCH] Added IMAGE_COMPRESSION_QUALITY setting back Fixes #1089 --- wagtail/wagtailimages/models.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index 482176e608..23a7c00f7f 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -4,6 +4,7 @@ import os.path import hashlib import re from contextlib import contextmanager +import warnings from six import BytesIO, text_type @@ -309,7 +310,18 @@ class Filter(models.Model): if willow.original_format == 'jpeg': # Allow changing of JPEG compression quality - quality = getattr(settings, 'WAGTAILIMAGES_JPEG_QUALITY', 85) + if hasattr(settings, 'WAGTAILIMAGES_JPEG_QUALITY'): + quality = settings.WAGTAILIMAGES_JPEG_QUALITY + elif hasattr(settings, 'IMAGE_COMPRESSION_QUALITY'): + quality = settings.IMAGE_COMPRESSION_QUALITY + + warnings.warn( + "The IMAGE_COMPRESSION_QUALITY setting has been renamed to " + "WAGTAILIMAGES_JPEG_QUALITY. Please update your settings." + , RemovedInWagtail11Warning) + else: + quality = 85 + willow.save_as_jpeg(output, quality=quality) else: willow.save(willow.original_format, output)