Commits

Chris Beaven  committed ecb40f8

Fix resolving of thumbnail option arguments. Since this was fundamentally broken, update to 3.2.1 too.

  • Participants
  • Parent commits d1c88a2
  • Tags 3.2.1

Comments (0)

Files changed (3)

 include LICENSE
-include MANIFEST.in
 include README
-include docs/_static
-include docs/_templates
-include docs/conf.py
-include docs/index.rst
-include docs/make.bat
-include docs/Makefile
-recursive-include sorl *
+include docs/*
  
 setup(
     name = 'sorl-thumbnail',
-    version = '3.2',
+    version = '3.2.1',
     url = 'http://code.google.com/p/sorl-thumbnail/',
-    download_url = 'http://sorl-thumbnail.googlecode.com/files/sorl-thumbnail-3.2.tar.gz',
+    download_url = 'http://sorl-thumbnail.googlecode.com/files/sorl-thumbnail-3.2.1.tar.gz',
     description = 'Thumbnails for Django',
     packages = [
         'sorl',

File sorl/thumbnail/templatetags/thumbnail.py

                 kwargs = {}
                 for key, value in self.kwargs.items():
                     kwargs[key] = value.resolve(context)
+                opts = dict([(k, v and v.resolve(context))
+                             for k, v in self.opts.items()])
                 thumbnail = DjangoThumbnail(relative_source, requested_size,
-                        opts=self.opts, processors=PROCESSORS, **kwargs)
+                                opts=opts, processors=PROCESSORS, **kwargs)
             except:
                 if DEBUG:
                     raise