From 3f7ca512af649c88ec0b87f19b4b2cfbeec70b65 Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Fri, 23 Sep 2011 12:44:53 -0400 Subject: [PATCH] Extension argument to cache_to includes dot. It seems that's how we do it in python world. Who am I to argue? --- imagekit/fields.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imagekit/fields.py b/imagekit/fields.py index b3aabd7..1965ed3 100755 --- a/imagekit/fields.py +++ b/imagekit/fields.py @@ -80,11 +80,11 @@ class ImageSpec(_ImageSpecMixin): def _get_suggested_extension(name, format): if format: # Try to look up an extension by the format - extensions = [k.lstrip('.') for k, v in Image.EXTENSION.iteritems() \ + extensions = [k for k, v in Image.EXTENSION.iteritems() \ if v == format.upper()] else: extensions = [] - original_extension = os.path.splitext(name)[1].lstrip('.') + original_extension = os.path.splitext(name)[1] if not extensions or original_extension.lower() in extensions: # If the original extension matches the format, use it. extension = original_extension @@ -189,7 +189,7 @@ class ImageSpecFile(object): """ filepath, basename = os.path.split(path) filename = os.path.splitext(basename)[0] - new_name = '{0}_{1}.{2}'.format(filename, specname, extension) + new_name = '{0}_{1}{2}'.format(filename, specname, extension) return os.path.join(os.path.join('cache', filepath), new_name) @property