From dd642fd05bae204989e8a2c74be506b28dd228b0 Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Thu, 3 Nov 2011 15:00:40 -0400 Subject: [PATCH] `format_to_extension` correctly handles `None` arg --- imagekit/utils.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/imagekit/utils.py b/imagekit/utils.py index b6ca548..07cd532 100644 --- a/imagekit/utils.py +++ b/imagekit/utils.py @@ -97,9 +97,10 @@ def _extension_to_format(extension): def _format_to_extension(format): - for k, v in Image.EXTENSION.iteritems(): - if v == format.upper(): - return k + if format: + for k, v in Image.EXTENSION.iteritems(): + if v == format.upper(): + return k return None @@ -121,11 +122,13 @@ def format_to_extension(format): """Returns the first extension that matches the provided format. """ - extension = _format_to_extension(format) - if not extension and _preinit_pil(): - extension = _format_to_extension(format) - if not extension and _init_pil(): + extension = None + if format: extension = _format_to_extension(format) + if not extension and _preinit_pil(): + extension = _format_to_extension(format) + if not extension and _init_pil(): + extension = _format_to_extension(format) if not extension: raise UnknownFormatError(format) return extension