From db4df4f82cd87a3147b394ab31585dea3587adfa Mon Sep 17 00:00:00 2001 From: Clay McClure Date: Tue, 27 Mar 2012 17:17:54 -0400 Subject: [PATCH] Add SpecFile.__unicode__ SpecFile is based after django.core.files.base.ContentFile, which lacks a __unicode__ method. This leads to an AttributeError when SpecFile.__repr__ is called. This is easily resolved by giving SpecFile a proper __unicode__ method. --- imagekit/generators.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/imagekit/generators.py b/imagekit/generators.py index a53bf09..39f64f4 100644 --- a/imagekit/generators.py +++ b/imagekit/generators.py @@ -4,6 +4,7 @@ import os from StringIO import StringIO from django.core.files.base import ContentFile +from django.utils.encoding import smart_str, smart_unicode from .processors import ProcessorPipeline, AutoConvert from .utils import img_to_fobj, open_image, \ @@ -25,7 +26,10 @@ class SpecFile(ContentFile): self.file.content_type = None def __str__(self): - return self.file.name + return smart_str(self.file.name or '') + + def __unicode__(self): + return smart_unicode(self.file.name or u'') class SpecFileGenerator(object):