diff --git a/README.rst b/README.rst index 7958110..c968bd7 100644 --- a/README.rst +++ b/README.rst @@ -33,7 +33,7 @@ Much like ``django.db.models.ImageField``, Specs are defined as properties of a model class:: from django.db import models - from imagekit.models import ImageSpecField + from imagekit.models.fields import ImageSpecField class Photo(models.Model): original_image = models.ImageField(upload_to='photos') @@ -48,7 +48,7 @@ an ImageFile-like object (just like with a normal photo.original_image.url # > '/media/photos/birthday.tiff' photo.formatted_image.url # > '/media/cache/photos/birthday_formatted_image.jpeg' -Check out ``imagekit.models.ImageSpecField`` for more information. +Check out ``imagekit.models.fields.ImageSpecField`` for more information. Processors @@ -59,7 +59,7 @@ something to it, and return the result. By providing a list of processors to your spec, you can expose different versions of the original image:: from django.db import models - from imagekit.models import ImageSpecField + from imagekit.models.fields import ImageSpecField from imagekit.processors import resize, Adjust class Photo(models.Model): diff --git a/imagekit/models/__init__.py b/imagekit/models/__init__.py new file mode 100644 index 0000000..420f592 --- /dev/null +++ b/imagekit/models/__init__.py @@ -0,0 +1,9 @@ +from .fields import ImageSpecField, ProcessedImageField + + +class ImageSpec(ImageSpecField): + def __init__(self, *args, **kwargs): + warnings.warn('ImageSpec has been moved to' + ' imagekit.models.fields.ImageSpecField. Please use that' + ' instead.', DeprecationWarning) + super(ImageSpec, self).__init__(*args, **kwargs) diff --git a/imagekit/models.py b/imagekit/models/fields.py old mode 100755 new mode 100644 similarity index 97% rename from imagekit/models.py rename to imagekit/models/fields.py index a170216..038bf72 --- a/imagekit/models.py +++ b/imagekit/models/fields.py @@ -102,13 +102,6 @@ class ImageSpecField(_ImageSpecFieldMixin): dispatch_uid='%s.delete' % uid) -class ImageSpec(ImageSpecField): - def __init__(self, *args, **kwargs): - warnings.warn('ImageSpec has been renamed to ImageSpecField. Please' - ' use that instead.', DeprecationWarning) - super(ImageSpec, self).__init__(*args, **kwargs) - - def _get_suggested_extension(name, format): original_extension = os.path.splitext(name)[1] try: @@ -374,7 +367,7 @@ class ProcessedImageField(models.ImageField, _ImageSpecFieldMixin): The ProcessedImageField constructor accepts all of the arguments that the :class:`django.db.models.ImageField` constructor accepts, as well as the ``processors``, ``format``, and ``options`` arguments of - :class:`imagekit.models.ImageSpecField`. + :class:`imagekit.models.fields.ImageSpecField`. """ if 'quality' in kwargs: @@ -398,4 +391,4 @@ try: except ImportError: pass else: - add_introspection_rules([], [r'^imagekit\.models\.ProcessedImageField$']) + add_introspection_rules([], [r'^imagekit\.models\.fields\.ProcessedImageField$']) diff --git a/tests/core/tests.py b/tests/core/tests.py index 6fe7eb2..6ccc977 100644 --- a/tests/core/tests.py +++ b/tests/core/tests.py @@ -9,7 +9,7 @@ from django.test import TestCase from imagekit import utils from imagekit.lib import Image -from imagekit.models import ImageSpecField +from imagekit.models.fields import ImageSpecField from imagekit.processors import Adjust from imagekit.processors.resize import Fill from imagekit.processors.crop import SmartCrop