From 2e6381f49031646497d3b7f131046aee5d190ac6 Mon Sep 17 00:00:00 2001 From: Rob Speed Date: Thu, 29 Dec 2016 19:28:25 -0500 Subject: [PATCH] Modifies the dynamic module import to prevent errors when the settings are different types. Both the THUMBNAIL_PROCESSORS and THUMBNAIL_SOURCE_GENERATORS settings are cast to tuples prior to being combined. --- easy_thumbnails/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easy_thumbnails/utils.py b/easy_thumbnails/utils.py index 1aa8dba1..e9024b50 100644 --- a/easy_thumbnails/utils.py +++ b/easy_thumbnails/utils.py @@ -49,8 +49,8 @@ def valid_processor_options(processors=None): if processors is None: processors = [ dynamic_import(p) for p in - settings.THUMBNAIL_PROCESSORS + - settings.THUMBNAIL_SOURCE_GENERATORS] + tuple(settings.THUMBNAIL_PROCESSORS) + + tuple(settings.THUMBNAIL_SOURCE_GENERATORS)] valid_options = set(['size', 'quality', 'subsampling']) for processor in processors: args = inspect.getargspec(processor)[0]