Fixes #729 - THUMBNAIL_STORAGES is an alias to Django STORAGES

CHANGES.rst

@@ -2,6 +2,11 @@
 Changes
 =======
 
+Unreleased
+==========
+* ``THUMBNAIL_STORAGE`` should now be an alias in the Django ``STORAGES`` setting.
+  The old way of specifying a dotted path to a Storage module is still supported.
+
 12.11.0
 =======
 * Deprecated ``THUMBNAIL_KVSTORE``. Only the Django cache-based store will be

docs/reference/settings.rst

@@ -166,9 +166,11 @@ Only applicable for the convert Engine.
 ``THUMBNAIL_STORAGE``
 =====================
 
-- Default: ``settings.DEFAULT_FILE_STORAGE``
+- Default: ``default``
 
-The storage class to use for the generated thumbnails.
+The storage to use for the generated thumbnails, as an alias from the Django
+``STORAGES`` setting.
+Optionally accepts a path to a Storage subclass.
 
 
 ``THUMBNAIL_REDIS_URL``

sorl/thumbnail/conf/defaults.py

@@ -1,5 +1,3 @@
-from django.conf import settings
-
 # When True ThumbnailNode.render can raise errors
 THUMBNAIL_DEBUG = False
 
@@ -30,8 +28,8 @@
 THUMBNAIL_VIPSTHUMBNAIL = 'vipsthumbnail'
 THUMBNAIL_VIPSHEADER = 'vipsheader'
 
-# Storage for the generated thumbnails
-THUMBNAIL_STORAGE = settings.STORAGES['default']['BACKEND']
+# Storage for the generated thumbnails, as an alias of the Django STORAGES setting.
+THUMBNAIL_STORAGE = 'default'
 
 # Redis settings
 THUMBNAIL_REDIS_DB = 0

sorl/thumbnail/default.py

@@ -1,3 +1,4 @@
+from django.core.files.storage import storages
 from django.utils.functional import LazyObject
 
 from sorl.thumbnail.conf import settings
@@ -21,7 +22,10 @@ def _setup(self):
 
 class Storage(LazyObject):
     def _setup(self):
-        self._wrapped = get_module_class(settings.THUMBNAIL_STORAGE)()
+        if "." in settings.THUMBNAIL_STORAGE:
+            self._wrapped = get_module_class(settings.THUMBNAIL_STORAGE)()
+        else:
+            self._wrapped = storages[settings.THUMBNAIL_STORAGE]
 
 
 backend = Backend()

sorl/thumbnail/images.py

@@ -8,7 +8,7 @@
 from urllib.request import Request, urlopen
 
 from django.core.files.base import ContentFile, File
-from django.core.files.storage import Storage  # , default_storage
+from django.core.files.storage import Storage
 from django.utils.encoding import force_str
 from django.utils.functional import LazyObject, empty
 

tests/settings/default.py

@@ -12,7 +12,7 @@
     'level': 'ERROR',
 }
 THUMBNAIL_KVSTORE = 'tests.thumbnail_tests.kvstore.TestKVStore'
-THUMBNAIL_STORAGE = 'tests.thumbnail_tests.storage.TestStorage'
+THUMBNAIL_STORAGE = 'default'
 STORAGES = {
     "default": {
         "BACKEND": "tests.thumbnail_tests.storage.TestStorage",

tests/thumbnail_tests/test_storage.py

@@ -1,5 +1,7 @@
 import unittest
 
+from django.test.utils import override_settings
+
 from sorl.thumbnail import default, get_thumbnail
 from sorl.thumbnail.helpers import get_module_class
 
@@ -37,6 +39,11 @@ def test_safe_methods(self):
         self.assertIsNotNone(im.y)
         self.assertEqual(self.log, [])
 
+    @override_settings(THUMBNAIL_STORAGE="tests.thumbnail_tests.storage.TestStorage")
+    def test_storage_setting_as_path_to_class(self):
+        storage = default.Storage()
+        self.assertEqual(storage.__class__.__name__, "TestStorage")
+
 
 class UrlStorageTestCase(unittest.TestCase):
     def test_encode_utf8_filenames(self):