Merge branch 'django-cms:master' into master

Author: fsbraun

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
 #        args: [--target-version, "2.2"]
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
 
@@ -31,7 +31,7 @@ repos:
       - id: yesqa
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-merge-conflict
       - id: mixed-line-ending

filer/admin/fileadmin.py

@@ -48,7 +48,7 @@ def clean(self):
             validate_upload(
                 file_name=cleaned_data["file"].name,
                 file=file.file,
-                owner=cleaned_data["owner"],
+                owner=cleaned_data.get("owner"),
                 mime_type=mime_type,
             )
             file.open("r")

filer/admin/imageadmin.py

@@ -46,8 +46,7 @@ def clean_subject_location(self):
         for subject location widget to receive valid coordinates on field
         validation errors.
         """
-        cleaned_data = super().clean()
-        subject_location = cleaned_data['subject_location']
+        subject_location = self.cleaned_data['subject_location']
         if not subject_location:
             # if supplied subject location is empty, do not check it
             return subject_location
@@ -69,7 +68,7 @@ def clean_subject_location(self):
         else:
             return subject_location
 
-        self._set_previous_subject_location(cleaned_data)
+        self._set_previous_subject_location(self.cleaned_data)
         raise forms.ValidationError(
             string_concat(
                 err_msg,