Upgrade project meta data and actions

Author: fsbraun

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install flake8
-        run: pip install --upgrade flake8
+        run: pip install --upgrade flake8 flake8-pyproject
       - name: Run flake8
         uses: liskin/gh-problem-matcher-wrap@v1
         with:

.pre-commit-config.yaml

@@ -8,22 +8,23 @@ ci:
     autoupdate_schedule: monthly
 
 repos:
-#  - repo: https://github.com/asottile/pyupgrade
-#    rev: v2.37.3
-#    hooks:
-#      - id: pyupgrade
-#        args: ["--py36-plus"]
-#
-#  - repo: https://github.com/adamchainz/django-upgrade
-#    rev: '1.7.0'
-#    hooks:
-#      - id: django-upgrade
-#        args: [--target-version, "2.2"]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.37.3
+    hooks:
+      - id: pyupgrade
+        args: ["--py39-plus"]
+
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: '1.7.0'
+    hooks:
+      - id: django-upgrade
+        args: [--target-version, "3.2"]
 
   - repo: https://github.com/PyCQA/flake8
     rev: 7.1.1
     hooks:
       - id: flake8
+        additional_dependencies: [flake8-pyproject]
 
   - repo: https://github.com/asottile/yesqa
     rev: v1.5.0

aldryn_config.py

@@ -24,7 +24,7 @@ def to_settings(self, data, settings):
         settings.setdefault('MEDIA_HEADERS', []).insert(0, (
             r'filer_public(?:_thumbnails)?/.*',
             {
-                'Cache-Control': 'public, max-age={}'.format(86400 * 365),
+                'Cache-Control': f'public, max-age={86400 * 365}',
             },
         ))
 
@@ -34,12 +34,12 @@ def to_settings(self, data, settings):
         settings['THUMBNAIL_CACHE_DIMENSIONS'] = True
 
         # Swap scale and crop for django-filer version
-        settings['THUMBNAIL_PROCESSORS'] = tuple([
+        settings['THUMBNAIL_PROCESSORS'] = tuple(
             processor
             if processor != 'easy_thumbnails.processors.scale_and_crop'
             else 'filer.thumbnail_processors.scale_and_crop_with_subject_location'
             for processor in EasyThumbnailSettings.THUMBNAIL_PROCESSORS
-        ])
+        )
 
         # easy_thumbnails uses django's default storage backend (local file
         # system storage) by default, even if the DEFAULT_FILE_STORAGE setting

docs/conf.py

@@ -57,7 +57,7 @@
 
 # General information about the project.
 project = 'django-filer'
-copyright = '%s, Stefan Foulis' % (datetime.date.today().year,)
+copyright = f'{datetime.date.today().year}, Stefan Foulis'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

filer/admin/patched/admin_utils.py

@@ -40,7 +40,7 @@ def format_callback(obj):
         has_admin = obj.__class__ in admin_site._registry
         opts = obj._meta
 
-        no_edit_link = '%s: %s' % (capfirst(opts.verbose_name),
+        no_edit_link = '{}: {}'.format(capfirst(opts.verbose_name),
                                    force_str(obj))
 
         if has_admin:
@@ -54,7 +54,7 @@ def format_callback(obj):
                 # Change url doesn't exist -- don't display link to edit
                 return no_edit_link
 
-            p = '%s.%s' % (opts.app_label,
+            p = '{}.{}'.format(opts.app_label,
                            get_permission_codename('delete', opts))
             if not user.has_perm(p):
                 perms_needed.add(opts.verbose_name)

filer/cache.py

@@ -71,7 +71,7 @@ def clear_folder_permission_cache(user: UserModel, permission: typing.Optional[s
         cache.delete(get_folder_perm_cache_key(user, permission))
 
 
-def update_folder_permission_cache(user: UserModel, permission: str, id_list: typing.List[int]) -> None:
+def update_folder_permission_cache(user: UserModel, permission: str, id_list: list[int]) -> None:
     """
     Updates the cached folder permissions for a given user and permission.
 

filer/management/commands/generate_thumbnails.py

@@ -17,12 +17,12 @@ def handle(self, *args, **options):
             image = None
             try:
                 image = Image.objects.get(pk=pk)
-                self.stdout.write(u'Processing image {0} / {1} {2}'.format(idx + 1, total, image))
+                self.stdout.write(f'Processing image {idx + 1} / {total} {image}')
                 self.stdout.flush()
                 image.thumbnails
                 image.icons
-            except IOError as e:
-                self.stderr.write('Failed to generate thumbnails: {0}'.format(str(e)))
+            except OSError as e:
+                self.stderr.write(f'Failed to generate thumbnails: {str(e)}')
                 self.stderr.flush()
             finally:
                 del image

filer/management/commands/import_files.py

@@ -47,7 +47,7 @@ def import_file(self, file_obj, folder):
             if created:
                 self.file_created += 1
         if self.verbosity >= 2:
-            print("file_created #%s / image_created #%s -- file : %s -- created : %s" % (self.file_created,
+            print("file_created #{} / image_created #{} -- file : {} -- created : {}".format(self.file_created,
                                                         self.image_created,
                                                         obj, created))
         return obj
@@ -70,7 +70,7 @@ def get_or_create_folder(self, folder_names):
             if created:
                 self.folder_created += 1
                 if self.verbosity >= 2:
-                    print("folder_created #%s folder : %s -- created : %s" % (self.folder_created, current_parent, created))
+                    print(f"folder_created #{self.folder_created} folder : {current_parent} -- created : {created}")
         return current_parent
 
     def walker(self, path=None, base_folder=None):
@@ -84,9 +84,9 @@ def walker(self, path=None, base_folder=None):
         path = os.path.normpath(path)
         if base_folder:
             base_folder = os.path.normpath(base_folder)
-            print("The directory structure will be imported in %s" % (base_folder,))
+            print(f"The directory structure will be imported in {base_folder}")
         if self.verbosity >= 1:
-            print("Import the folders and files in %s" % (path,))
+            print(f"Import the folders and files in {path}")
         root_folder_name = os.path.basename(path)
         for root, dirs, files in os.walk(path):
             rel_folders = root.partition(path)[2].strip(os.path.sep).split(os.path.sep)

filer/migrations/0001_initial.py

@@ -104,7 +104,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='folder',
-            unique_together=set([('parent', 'name')]),
+            unique_together={('parent', 'name')},
         ),
         migrations.AddField(
             model_name='file',

filer/server/backends/default.py

@@ -24,7 +24,7 @@ def serve(self, request, filer_file, **kwargs):
         # Respect the If-Modified-Since header.
         statobj = os.stat(fullpath)
         response_params = {'content_type': filer_file.mime_type}
-        if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),
+        if not was_modified_since(request.headers.get('if-modified-since'),
                                   statobj[stat.ST_MTIME]):
             return HttpResponseNotModified(**response_params)
         response = HttpResponse(open(fullpath, 'rb').read(), **response_params)