Hopiu/django-imagekit
1
0
Fork 0
mirror of https://github.com/Hopiu/django-imagekit.git synced 2026-04-17 11:41:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use old-style string formatting

Browse source
This commit is contained in:
Matthew Tretter 2012-01-26 18:19:39 -05:00
parent 8447064936
commit 343f14ad48
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
imagekit/models.py
View file

@ -172,13 +172,13 @@ class ImageSpecFile(_ImageSpecFileMixin, ImageFieldFile):
self.instance.__class__._meta.fields if \
isinstance(f, models.ImageField)]
if len(image_fields) == 0:
raise Exception('{0} does not define any ImageFields, so your '
'{1} ImageSpec has no image to act on.'.format(
self.instance.__class__.__name__, self.attname))
raise Exception('%s does not define any ImageFields, so your' \
' %s ImageSpec has no image to act on.' % \
(self.instance.__class__.__name__, self.attname))
elif len(image_fields) > 1:
raise Exception('{0} defines multiple ImageFields, but you have '
'not specified an image_field for your {1} '
'ImageSpec.'.format(self.instance.__class__.__name__,
raise Exception('%s defines multiple ImageFields, but you' \
' have not specified an image_field for your %s' \
' ImageSpec.' % (self.instance.__class__.__name__,
self.attname))
else:
field_file = image_fields[0]
@ -268,7 +268,7 @@ class ImageSpecFile(_ImageSpecFileMixin, ImageFieldFile):
"""
filepath, basename = os.path.split(path)
filename = os.path.splitext(basename)[0]
new_name = '{0}_{1}{2}'.format(filename, specname, extension)
new_name = '%s_%s%s' % (filename, specname, extension)
return os.path.join(os.path.join('cache', filepath), new_name)
@property
@ -381,7 +381,7 @@ class ProcessedImageField(models.ImageField, _ImageSpecMixin):
filename = os.path.normpath(self.storage.get_valid_name(os.path.basename(filename)))
name, ext = os.path.splitext(filename)
ext = _get_suggested_extension(filename, self.format)
return '{0}{1}'.format(name, ext)
return '%s%s' % (name, ext)
try: