Merge branch 'develop' into ci-improvements

Author: agateblue

README.rst

@@ -31,7 +31,7 @@ Dynamic-preferences allow you to register settings (a.k.a. preferences) in a dec
 
 With dynamic-preferences, you can update settings on the fly, through django's admin or custom forms, without restarting your application.
 
-The project is tested and work under Python 3.6, 3.7, 3.8 and 3.9 and with django 2.2, 3.0 and 3.1.
+The project is tested and work under Python 3.7, 3.8, 3.9, 3.10 and 3.11 and with django 3.2 and 4.1.
 
 Features
 --------

dynamic_preferences/admin.py

@@ -76,7 +76,7 @@ def section_name(self, obj):
 
     def save_model(self, request, obj, form, change):
         pref = form.instance
-        manager = pref.registry.manager()
+        manager = pref.registry.manager(instance=getattr(obj, "instance", None))
         manager.update_db_pref(pref.section, pref.name, form.cleaned_data["raw_value"])
 
 

dynamic_preferences/managers.py

@@ -104,18 +104,22 @@ def many_from_cache(self, preferences):
             if k in cached
         }
 
-    def to_cache(self, pref):
+    def to_cache(self, *prefs):
         """
-        Update/create the cache value for the given preference model instance
+        Update/create the cache value for the given preference model instances
         """
-        key = self.get_cache_key(pref.section, pref.name)
-        value = pref.raw_value
-        if value is None or value == "":
-            # some cache backends refuse to cache None or empty values
-            # resulting in more DB queries, so we cache an arbitrary value
-            # to ensure the cache is hot (even with empty values)
-            value = preferences_settings.CACHE_NONE_VALUE
-        self.cache.set(key, value)
+        update_dict = {}
+        for pref in prefs:
+            key = self.get_cache_key(pref.section, pref.name)
+            value = pref.raw_value
+            if value is None or value == "":
+                # some cache backends refuse to cache None or empty values
+                # resulting in more DB queries, so we cache an arbitrary value
+                # to ensure the cache is hot (even with empty values)
+                value = preferences_settings.CACHE_NONE_VALUE
+            update_dict[key] = value
+
+        self.cache.set_many(update_dict)
 
     def pref_obj(self, section, name):
         return self.registry.get(section=section, name=name)
@@ -220,6 +224,8 @@ def load_from_db(self, cache=False):
         """Return a dictionary of preferences by section directly from DB"""
         a = {}
         db_prefs = {p.preference.identifier(): p for p in self.queryset}
+        cache_prefs = []
+
         for preference in self.registry.preferences():
             try:
                 db_pref = db_prefs[preference.identifier()]
@@ -232,8 +238,11 @@ def load_from_db(self, cache=False):
             else:
                 # cache if create_db_pref() hasn't already done so
                 if cache:
-                    self.to_cache(db_pref)
+                    cache_prefs.append(db_pref)
 
             a[preference.identifier()] = db_pref.value
 
+        if cache_prefs:
+            self.to_cache(*cache_prefs)
+
         return a

dynamic_preferences/serializers.py

@@ -2,7 +2,7 @@
 import decimal
 import os
 
-from datetime import date, timedelta, datetime, time
+from datetime import date, timedelta, datetime, time, timezone
 
 from django.conf import settings
 from django.core.validators import EMPTY_VALUES
@@ -15,7 +15,6 @@
 from django.utils.duration import duration_string
 from django.utils.encoding import force_str
 from django.utils.timezone import (
-    utc,
     is_aware,
     make_aware,
     make_naive,
@@ -252,10 +251,14 @@ def to_db(self, value, **kwargs):
             # Support single instances in this serializer to allow
             # create_deletion_handler to work for model multiple choice preferences
             value = [value.pk]
-        else:
+        elif hasattr(value, 'values_list'):
             value = list(value.values_list("pk", flat=True))
-
-        if self.sort:
+        elif isinstance(value, list) and len(value) > 0 and isinstance(value[0], self.model):
+            # Handle lists of model instances
+            value = [i.pk for i in value]
+        else:
+            raise ValueError(f'Cannot handle value {value} of type {type(value)}')
+        if value and self.sort:
             value = sorted(value)
 
         return self.separator.join(map(str, value))
@@ -411,7 +414,7 @@ def enforce_timezone(cls, value):
         if (field_timezone is not None) and not is_aware(value):
             return make_aware(value, field_timezone)
         elif (field_timezone is None) and is_aware(value):
-            return make_naive(value, utc)
+            return make_naive(value, timezone.utc)
         return value
 
     @classmethod

requirements.txt

@@ -1,3 +1,3 @@
 six
-wheel==0.24.0
+wheel==0.38.1
 persisting_theory==1.0

tests/test_serializers.py

@@ -335,3 +335,24 @@ def test_model_multiple_single_serialization_with_non_int_pk(blog_entries):
     blog_entry = BlogEntryWithNonIntPk.objects.all().first()
 
     assert s.serialize(blog_entry) == s.separator.join(map(str, [blog_entry.pk]))
+
+
+
+def test_model_multiple_to_db_empty(blog_entries):
+    result = serializers.ModelMultipleSerializer(BlogEntry).to_db([])
+    assert result is None
+
+
+def test_model_multiple_to_db_multiple(blog_entries):
+    entry1 = BlogEntry.objects.get(title="This is a test",)
+    entry2 = BlogEntry.objects.get(title="This is only a test",)
+    result = serializers.ModelMultipleSerializer(BlogEntry).to_db([
+        entry1,
+        entry2,
+    ])
+    assert result == f'{entry1.pk},{entry2.pk}'
+
+
+def test_model_multiple_to_db_invalid(blog_entries):
+    with pytest.raises(ValueError, match=r"Cannot handle value.* of type .*"):
+        serializers.ModelMultipleSerializer(BlogEntry).to_db('invalid')

tox.ini

@@ -24,6 +24,7 @@ deps =
 
 
 basepython =
+    py311: python3.11
     py310: python3.10
     py39: python3.9
     py38: python3.8