mirror of
https://github.com/Hopiu/django-imagekit.git
synced 2026-04-24 23:14:42 +00:00
Remove SpecWrapper class
We don't need it now that we have an ImageSpec class
This commit is contained in:
parent
37e0de3069
commit
3308c92a71
2 changed files with 1 additions and 29 deletions
|
|
@ -2,16 +2,13 @@ from django.core.files.base import ContentFile
|
|||
from django.db.models.fields.files import ImageFieldFile
|
||||
from django.utils.encoding import smart_str, smart_unicode
|
||||
import os
|
||||
from .utils import (SpecWrapper, suggest_extension, format_to_mimetype,
|
||||
from .utils import (suggest_extension, format_to_mimetype,
|
||||
extension_to_mimetype)
|
||||
|
||||
|
||||
class ImageSpecFile(ImageFieldFile):
|
||||
def __init__(self, spec, source_file, spec_id):
|
||||
spec = SpecWrapper(spec)
|
||||
|
||||
self.storage = spec.storage or source_file.storage
|
||||
|
||||
self.spec = spec
|
||||
self.source_file = source_file
|
||||
self.spec_id = spec_id
|
||||
|
|
|
|||
|
|
@ -398,28 +398,3 @@ def autodiscover():
|
|||
# attempting to import it, otherwise we want it to bubble up.
|
||||
if module_has_submodule(mod, 'imagespecs'):
|
||||
raise
|
||||
|
||||
|
||||
class SpecWrapper(object):
|
||||
"""
|
||||
Wraps a user-defined spec object so we can access properties that don't
|
||||
exist without errors.
|
||||
|
||||
"""
|
||||
def __init__(self, spec):
|
||||
self.processors = getattr(spec, 'processors', None)
|
||||
self.format = getattr(spec, 'format', None)
|
||||
self.options = getattr(spec, 'options', None)
|
||||
self.autoconvert = getattr(spec, 'autoconvert', True)
|
||||
self.storage = getattr(spec, 'storage', None)
|
||||
self.image_cache_backend = getattr(spec, 'image_cache_backend', None)
|
||||
# TODO: get_hash default return value.
|
||||
self.get_hash = getattr(spec, 'get_hash', lambda f: None)
|
||||
# TODO: generate_filename default return value.
|
||||
self.generate_filename = getattr(spec, 'generate_filename', lambda f: None)
|
||||
# TODO: generate_file default return value.
|
||||
self.generate_file = getattr(spec, 'generate_file', lambda f: None)
|
||||
|
||||
if not self.image_cache_backend:
|
||||
from .imagecache.backends import get_default_image_cache_backend
|
||||
self.image_cache_backend = get_default_image_cache_backend()
|
||||
|
|
|
|||
Loading…
Reference in a new issue