Merge branch 'master' into dependabot/github_actions/actions/cache-4.2.0

Author: fsbraun

djangocms_versioning/admin.py

@@ -916,7 +916,7 @@ def compare_versions(self, request, queryset):
             f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}_compare",
             args=(queryset[0].pk,),
         )
-        url += "?compare_to=%d" % queryset[1].pk
+        url += f"?compare_to={queryset[1].pk}"
 
         return redirect(url)
 

djangocms_versioning/cms_config.py

@@ -279,7 +279,7 @@ def get_readonly_fields(self, request, obj=None):
                 if form.fieldsets:
                     fields = flatten_fieldsets(form.fieldsets)
                 fields = list(fields)
-                for f_name in ["slug", "overwrite_url"]:
+                for f_name in {"slug", "overwrite_url"}.intersection(fields):
                     fields.remove(f_name)
         return fields
 

djangocms_versioning/test_utils/factories.py

@@ -104,7 +104,7 @@ def version(self, create, extracted, **kwargs):
 class AnswerFactory(factory.django.DjangoModelFactory):
     poll_content = factory.SubFactory(PollContentFactory)
     text = factory.LazyAttributeSequence(
-        lambda o, n: "Poll %s - Answer %d" % (o.poll_content.poll.name, n)
+        lambda o, n: f"Poll {o.poll_content.poll.name} - Answer {n}"
     )
 
     class Meta:

tests/test_admin.py

@@ -2156,7 +2156,7 @@ def test_compare_view_has_version_data_in_context_when_version2_in_get_param(sel
         url = self.get_admin_url(
             self.versionable.version_model_proxy, "compare", versions[0].pk
         )
-        url += "?compare_to=%d" % versions[1].pk
+        url += f"?compare_to={versions[1].pk}"
         user = self.get_staff_user_with_no_permissions()
 
         with self.login_user_context(user):