From 1ac3399737dde40bee15a5a75c46d4ebdbc22bf8 Mon Sep 17 00:00:00 2001
From: Venelin Stoykov <vkstoykov@gmail.com>
Date: Sun, 28 Sep 2014 18:31:33 +0300
Subject: [PATCH] Deprecate `imagekit.processors` submodules

- `base`, `crop`, `resize`, and `utils` are now placed in `pilkit` app
- remove magic compatibility between `imagekit.processors` and `pilkit.procesors`
---
 imagekit/__init__.py            |  1 -
 imagekit/importers.py           | 31 -------------------------------
 imagekit/processors.py          |  5 -----
 imagekit/processors/__init__.py | 12 ++++++++++++
 imagekit/processors/base.py     |  7 +++++++
 imagekit/processors/crop.py     |  7 +++++++
 imagekit/processors/resize.py   |  7 +++++++
 imagekit/processors/utils.py    |  5 +++++
 8 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100644 imagekit/importers.py
 delete mode 100644 imagekit/processors.py
 create mode 100644 imagekit/processors/__init__.py
 create mode 100644 imagekit/processors/base.py
 create mode 100644 imagekit/processors/crop.py
 create mode 100644 imagekit/processors/resize.py
 create mode 100644 imagekit/processors/utils.py

diff --git a/imagekit/__init__.py b/imagekit/__init__.py
index d78a130..6e92fb3 100644
--- a/imagekit/__init__.py
+++ b/imagekit/__init__.py
@@ -1,5 +1,4 @@
 # flake8: noqa
-from . import importers
 from . import conf
 from . import generatorlibrary
 from .specs import ImageSpec
diff --git a/imagekit/importers.py b/imagekit/importers.py
deleted file mode 100644
index 87ba2b6..0000000
--- a/imagekit/importers.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import re
-import sys
-
-
-class ProcessorImporter(object):
-    """
-    The processors were moved to the PILKit project so they could be used
-    separtely from ImageKit (which has a bunch of Django dependencies). However,
-    there's no real need to expose this fact (and we want to maintain backwards
-    compatibility), so we proxy all "imagekit.processors" imports to
-    "pilkit.processors" using this object.
-
-    """
-    pattern = re.compile(r'^imagekit\.processors((\..*)?)$')
-
-    def find_module(self, name, path=None):
-        if self.pattern.match(name):
-            return self
-
-    def load_module(self, name):
-        if name in sys.modules:
-            return sys.modules[name]
-
-        from django.utils.importlib import import_module
-        new_name = self.pattern.sub(r'pilkit.processors\1', name)
-        mod = import_module(new_name)
-        sys.modules[name] = mod
-        return mod
-
-
-sys.meta_path.insert(0, ProcessorImporter())
diff --git a/imagekit/processors.py b/imagekit/processors.py
deleted file mode 100644
index dbf0b03..0000000
--- a/imagekit/processors.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""
-Looking for processors? They have moved to PILKit. See imagekit.importers for
-details.
-
-"""
diff --git a/imagekit/processors/__init__.py b/imagekit/processors/__init__.py
new file mode 100644
index 0000000..7c3532f
--- /dev/null
+++ b/imagekit/processors/__init__.py
@@ -0,0 +1,12 @@
+from pilkit.processors import *
+
+__all__ = [
+	# Base
+	'ProcessorPipeline', 'Adjust', 'Reflection', 'Transpose',
+	'Anchor', 'MakeOpaque',
+	# Crop
+	'TrimBorderColor', 'Crop', 'SmartCrop',
+	# Resize
+	'Resize', 'ResizeToCover', 'ResizeToFill', 'SmartResize',
+	'ResizeCanvas', 'AddBorder', 'ResizeToFit', 'Thumbnail'
+]
diff --git a/imagekit/processors/base.py b/imagekit/processors/base.py
new file mode 100644
index 0000000..c94a966
--- /dev/null
+++ b/imagekit/processors/base.py
@@ -0,0 +1,7 @@
+import warnings
+
+from pilkit.processors.base import *
+
+warnings.warn('imagekit.processors.base is deprecated use imagekit.processors instead', DeprecationWarning)
+
+__all__ = ['ProcessorPipeline', 'Adjust', 'Reflection', 'Transpose', 'Anchor', 'MakeOpaque']
diff --git a/imagekit/processors/crop.py b/imagekit/processors/crop.py
new file mode 100644
index 0000000..b519d1a
--- /dev/null
+++ b/imagekit/processors/crop.py
@@ -0,0 +1,7 @@
+import warnings
+
+from pilkit.processors.crop import *
+
+warnings.warn('imagekit.processors.crop is deprecated use imagekit.processors instead', DeprecationWarning)
+
+__all__ = ['TrimBorderColor', 'Crop', 'SmartCrop']
diff --git a/imagekit/processors/resize.py b/imagekit/processors/resize.py
new file mode 100644
index 0000000..9c1cb30
--- /dev/null
+++ b/imagekit/processors/resize.py
@@ -0,0 +1,7 @@
+import warnings
+
+from pilkit.processors.resize import *
+
+warnings.warn('imagekit.processors.resize is deprecated use imagekit.processors instead', DeprecationWarning)
+
+__all__ = ['Resize', 'ResizeToCover', 'ResizeToFill', 'SmartResize', 'ResizeCanvas', 'AddBorder', 'ResizeToFit', 'Thumbnail']
diff --git a/imagekit/processors/utils.py b/imagekit/processors/utils.py
new file mode 100644
index 0000000..4b829cd
--- /dev/null
+++ b/imagekit/processors/utils.py
@@ -0,0 +1,5 @@
+import warnings
+
+from pilkit.processors.utils import *
+
+warnings.warn('imagekit.processors.utils is deprecated use pilkit.processors.utils instead', DeprecationWarning)