Merge pull request #47 from Nebuchadrezzar/django_42

Addressing issue #46: Update for django 4.2

Author: vinyll

README.md

@@ -99,9 +99,11 @@ Imagefit is a resize service, therefore include its urls.
 Prefix it with whatever you want (here "imagefit" for example):
 
 ```python
+from django.urls import re_path
+
 urlpatterns = urlpatterns('',
     …
-    url(r'^imagefit/', include('imagefit.urls')),
+    re_path(r'^imagefit/', include('imagefit.urls')),
 )
 ```
 

imagefit/conf.py

@@ -3,7 +3,9 @@
 
 import tempfile
 import os
-settings.configure()
+if not settings.configured:
+    settings.configure()
+
 
 class ImagefitConf(AppConf):
 

imagefit/models.py

@@ -51,7 +51,7 @@ def is_cached(self):
     def resize(self, width=None, height=None):
         return self.pil.thumbnail(
             (int(width), int(height)),
-            PilImage.ANTIALIAS)
+            PilImage.LANCZOS)
 
     def crop(self, width=None, height=None):
         img_w, img_h = self.pil.size

imagefit/views.py

@@ -3,6 +3,8 @@
 from django.core.cache import caches
 from django.utils.http import http_date
 from django.views.static import was_modified_since
+from inspect import Signature
+
 
 from imagefit.conf import settings
 from imagefit.models import Image, Presets
@@ -11,6 +13,7 @@
 import stat
 import time
 
+
 cache = caches[settings.IMAGEFIT_CACHE_BACKEND_NAME]
 
 
@@ -40,11 +43,21 @@ def resize(request, path_name, format, url):
     if not os.path.exists(path):
         return HttpResponse(status=404)
     image = Image(path=path)
-
     statobj = os.stat(image.path)
-    if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),
-                              statobj[stat.ST_MTIME], statobj[stat.ST_SIZE]):
-        return HttpResponseNotModified(content_type=image.mimetype)
+
+    # django.views.static.was_modified_since dropped its size argument in 4.1.
+    sig = Signature(was_modified_since)
+
+    if not sig.parameters.get('size'):
+        if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),
+                                  statobj[stat.ST_MTIME]):
+            return HttpResponseNotModified(content_type=image.mimetype)
+
+    if sig.parameters.get('size'):
+        if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),
+                                  statobj[stat.ST_MTIME],
+                                  statobj[stat.ST_SIZE]):
+            return HttpResponseNotModified(content_type=image.mimetype)
 
     image.cached_name = request.META.get('PATH_INFO')