Splitup wagtailimages utils

wagtail/wagtailimages/models.py

@@ -21,7 +21,7 @@ from unidecode import unidecode
 from wagtail.wagtailadmin.taggable import TagSearchable
 from wagtail.wagtailimages.backends import get_image_backend
 from wagtail.wagtailsearch import indexed
-from .utils import validate_image_format
+from wagtail.wagtailimages.utils.validators import validate_image_format
 
 
 @python_2_unicode_compatible

wagtail/wagtailimages/tests.py

@@ -18,6 +18,7 @@ from wagtail.wagtailimages.formats import (
 from wagtail.wagtailimages.backends import get_image_backend
 from wagtail.wagtailimages.backends.pillow import PillowBackend
 
+
 def get_test_image_file():
     from six import BytesIO
     from PIL import Image

wagtail/wagtailimages/utils/validators.py

@@ -3,7 +3,7 @@ import os
 from PIL import Image
 
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy  as _
+from django.utils.translation import ugettext_lazy as _
 
 
 def validate_image_format(f):