From af7c12cb684eb44ebdb0ea2f5eb420ca5b48f044 Mon Sep 17 00:00:00 2001
From: Matthew Tretter <matthew@exanimo.com>
Date: Fri, 20 Apr 2012 21:43:59 -0400
Subject: [PATCH] Tell people to import fields from the models module

---
 README.rst                         | 6 +++---
 docs/apireference.rst              | 2 +-
 imagekit/models/__init__.py        | 4 ++--
 imagekit/models/fields/__init__.py | 2 +-
 tests/core/models.py               | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 5a2ea01..3e6d21c 100644
--- a/README.rst
+++ b/README.rst
@@ -34,7 +34,7 @@ Much like ``django.db.models.ImageField``, Specs are defined as properties
 of a model class::
 
     from django.db import models
-    from imagekit.models.fields import ImageSpecField
+    from imagekit.models import ImageSpecField
 
     class Photo(models.Model):
         original_image = models.ImageField(upload_to='photos')
@@ -49,7 +49,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.fields.ImageSpecField`` for more information.
+Check out ``imagekit.models.ImageSpecField`` for more information.
 
 
 Processors
@@ -60,7 +60,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.fields import ImageSpecField
+    from imagekit.models import ImageSpecField
     from imagekit.processors import ResizeToFill, Adjust
 
     class Photo(models.Model):
diff --git a/docs/apireference.rst b/docs/apireference.rst
index d4a2ed8..df4b5c7 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -5,7 +5,7 @@ API Reference
 :mod:`models` Module
 --------------------
 
-.. automodule:: imagekit.models.fields
+.. automodule:: imagekit.models
    :members:
 
 
diff --git a/imagekit/models/__init__.py b/imagekit/models/__init__.py
index 97798e1..c5ef221 100644
--- a/imagekit/models/__init__.py
+++ b/imagekit/models/__init__.py
@@ -5,6 +5,6 @@ import warnings
 class ImageSpec(ImageSpecField):
     def __init__(self, *args, **kwargs):
         warnings.warn('ImageSpec has been moved to'
-                ' imagekit.models.fields.ImageSpecField. Please use that'
-                ' instead.', DeprecationWarning)
+                ' imagekit.models.ImageSpecField. Please use that instead.',
+                DeprecationWarning)
         super(ImageSpec, self).__init__(*args, **kwargs)
diff --git a/imagekit/models/fields/__init__.py b/imagekit/models/fields/__init__.py
index eb7b8d4..b2cceda 100644
--- a/imagekit/models/fields/__init__.py
+++ b/imagekit/models/fields/__init__.py
@@ -154,7 +154,7 @@ class ProcessedImageField(models.ImageField):
         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.fields.ImageSpecField`.
+        :class:`imagekit.models.ImageSpecField`.
 
         """
         if 'quality' in kwargs:
diff --git a/tests/core/models.py b/tests/core/models.py
index 35ffffb..2c3d8e4 100644
--- a/tests/core/models.py
+++ b/tests/core/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 
-from imagekit.models.fields import ImageSpecField
+from imagekit.models import ImageSpecField
 from imagekit.processors import Adjust
 from imagekit.processors import ResizeToFill
 from imagekit.processors import SmartCrop