From d88a5e596bf2cd6cdf10600c70d23750d86840c4 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Mon, 2 Jun 2014 09:36:06 +0100
Subject: [PATCH] Cleanup wagtailimages backends code

---
 wagtail/wagtailimages/backends/base.py   | 21 +++++++--------------
 wagtail/wagtailimages/backends/pillow.py |  7 +++++--
 wagtail/wagtailimages/backends/wand.py   |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailimages/backends/base.py b/wagtail/wagtailimages/backends/base.py
index 25b7e882d..43ea977c9 100644
--- a/wagtail/wagtailimages/backends/base.py
+++ b/wagtail/wagtailimages/backends/base.py
@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
+
 class InvalidImageBackendError(ImproperlyConfigured):
     pass
 
@@ -8,23 +9,22 @@ class InvalidImageBackendError(ImproperlyConfigured):
 class BaseImageBackend(object):
     def __init__(self, params):
         self.quality = getattr(settings, 'IMAGE_COMPRESSION_QUALITY', 85)
-        
+
     def open_image(self, input_file):
         """
-        Open an image and return the backend specific image object to pass 
-        to other methods. The object return has to have a size  attribute 
+        Open an image and return the backend specific image object to pass
+        to other methods. The object return has to have a size  attribute
         which is a tuple with the width and height of the image and a format
         attribute with the format of the image.
         """
         raise NotImplementedError('subclasses of BaseImageBackend must provide an open_image() method')
-        
-    
+
     def save_image(self, image, output):
         """
         Save the image to the output
         """
         raise NotImplementedError('subclasses of BaseImageBackend must provide a save_image() method')
-        
+
     def resize(self, image, size):
         """
         resize image to the requested size, using highest quality settings
@@ -32,11 +32,9 @@ class BaseImageBackend(object):
         """
         raise NotImplementedError('subclasses of BaseImageBackend must provide an resize() method')
 
-
     def crop_to_centre(self, image, size):
         raise NotImplementedError('subclasses of BaseImageBackend must provide a crop_to_centre() method')
 
-
     def resize_to_max(self, image, size):
         """
         Resize image down to fit within the given dimensions, preserving aspect ratio.
@@ -58,10 +56,8 @@ class BaseImageBackend(object):
             final_size = (target_width, int(original_height * horz_scale))
         else:
             final_size = (int(original_width * vert_scale), target_height)
-        
-        return self.resize(image, final_size)
-        
 
+        return self.resize(image, final_size)
 
     def resize_to_min(self, image, size):
         """
@@ -87,7 +83,6 @@ class BaseImageBackend(object):
 
         return self.resize(image, final_size)
 
-
     def resize_to_width(self, image, target_width):
         """
         Resize image down to the given width, preserving aspect ratio.
@@ -104,7 +99,6 @@ class BaseImageBackend(object):
 
         return self.resize(image, final_size)
 
-
     def resize_to_height(self, image, target_height):
         """
         Resize image down to the given height, preserving aspect ratio.
@@ -121,7 +115,6 @@ class BaseImageBackend(object):
 
         return self.resize(image, final_size)
 
-
     def resize_to_fill(self, image, size):
         """
         Resize down and crop image to fill the given dimensions. Most suitable for thumbnails.
diff --git a/wagtail/wagtailimages/backends/pillow.py b/wagtail/wagtailimages/backends/pillow.py
index 05d12d291..96976c277 100644
--- a/wagtail/wagtailimages/backends/pillow.py
+++ b/wagtail/wagtailimages/backends/pillow.py
@@ -1,6 +1,9 @@
-from base import BaseImageBackend
+from __future__ import absolute_import
+
+from .base import BaseImageBackend
 import PIL.Image
 
+
 class PillowBackend(BaseImageBackend):
     def __init__(self, params):
         super(PillowBackend, self).__init__(params)
@@ -32,4 +35,4 @@ class PillowBackend(BaseImageBackend):
         top = (original_height - final_height) / 2
         return image.crop(
             (left, top, left + final_width, top + final_height)
-        )
\ No newline at end of file
+        )
diff --git a/wagtail/wagtailimages/backends/wand.py b/wagtail/wagtailimages/backends/wand.py
index 36e352715..0c493eb52 100644
--- a/wagtail/wagtailimages/backends/wand.py
+++ b/wagtail/wagtailimages/backends/wand.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import
 
 from .base import BaseImageBackend
-
 from wand.image import Image
 
+
 class WandBackend(BaseImageBackend):
     def __init__(self, params):
         super(WandBackend, self).__init__(params)