Merge pull request django-guardian#900 from django-guardian/release-3-1

Apply style rules to 3.1.0 release

Author: thclark

guardian/management/commands/clean_orphan_obj_perms.py

@@ -13,10 +13,10 @@ class Command(BaseCommand):
         ```shell
         $ python manage.py clean_orphan_obj_perms
         Removed 11 object permission entries with no targets
-        
+
         $ python manage.py clean_orphan_obj_perms --batch-size 100 --max-batches 5
         Removed 500 object permission entries with no targets
-        
+
         $ python manage.py clean_orphan_obj_perms --batch-size 50 --skip-batches 2 --max-duration-secs 60
         Removed 200 object permission entries with no targets
         ```
@@ -26,43 +26,39 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         parser.add_argument(
-            '--batch-size',
+            "--batch-size",
             type=int,
-            help='Number of objects to process per batch. If not specified, all objects are processed at once.'
+            help="Number of objects to process per batch. If not specified, all objects are processed at once.",
         )
         parser.add_argument(
-            '--max-batches',
-            type=int,
-            help='Maximum number of batches to process. Use with --batch-size.'
+            "--max-batches", type=int, help="Maximum number of batches to process. Use with --batch-size."
         )
         parser.add_argument(
-            '--max-duration-secs',
-            type=int,
-            help='Maximum duration in seconds for the cleanup operation.'
+            "--max-duration-secs", type=int, help="Maximum duration in seconds for the cleanup operation."
         )
         parser.add_argument(
-            '--skip-batches',
+            "--skip-batches",
             type=int,
             default=0,
-            help='Number of batches to skip before starting cleanup. Use with --batch-size.'
+            help="Number of batches to skip before starting cleanup. Use with --batch-size.",
         )
 
     def handle(self, **options):
         kwargs = {}
-        
-        if options['batch_size'] is not None:
-            kwargs['batch_size'] = options['batch_size']
-        
-        if options['max_batches'] is not None:
-            kwargs['max_batches'] = options['max_batches']
-            
-        if options['max_duration_secs'] is not None:
-            kwargs['max_duration_secs'] = options['max_duration_secs']
-            
-        if options['skip_batches'] > 0:
-            kwargs['skip_batches'] = options['skip_batches']
+
+        if options["batch_size"] is not None:
+            kwargs["batch_size"] = options["batch_size"]
+
+        if options["max_batches"] is not None:
+            kwargs["max_batches"] = options["max_batches"]
+
+        if options["max_duration_secs"] is not None:
+            kwargs["max_duration_secs"] = options["max_duration_secs"]
+
+        if options["skip_batches"] > 0:
+            kwargs["skip_batches"] = options["skip_batches"]
 
         removed = clean_orphan_obj_perms(**kwargs)
-        
+
         if options["verbosity"] > 0:
             self.stdout.write("Removed %d object permission entries with no targets" % removed)

guardian/managers.py

@@ -45,8 +45,10 @@ def assign_perm(self, perm: str, user_or_group: Any, obj: Model) -> Any:
             kwargs["content_object"] = obj
         obj_perm, _ = self.get_or_create(**kwargs)
         return obj_perm
-      
-    def bulk_assign_perm(self, perm: str, user_or_group: Any, queryset: QuerySet, ignore_conflicts: bool=False) -> Any:
+
+    def bulk_assign_perm(
+        self, perm: str, user_or_group: Any, queryset: QuerySet, ignore_conflicts: bool = False
+    ) -> Any:
         """
         Bulk assigns permissions with given `perm` for an objects in `queryset` and
         `user_or_group`.
@@ -78,7 +80,7 @@ def bulk_assign_perm(self, perm: str, user_or_group: Any, queryset: QuerySet, ig
 
         return assigned_perms
 
-    def assign_perm_to_many(self, perm: str, users_or_groups: Any, obj: Model, ignore_conflicts: bool=False) -> Any:
+    def assign_perm_to_many(self, perm: str, users_or_groups: Any, obj: Model, ignore_conflicts: bool = False) -> Any:
         """
         Bulk assigns given `perm` for the object `obj` to a set of users or a set of groups.
         """

guardian/migrations/0003_remove_groupobjectpermission_guardian_gr_content_ae6aec_idx_and_more.py

@@ -5,37 +5,40 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('guardian', '0002_generic_permissions_index'),
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("guardian", "0002_generic_permissions_index"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.RemoveIndex(
-            model_name='groupobjectpermission',
-            name='guardian_gr_content_ae6aec_idx',
+            model_name="groupobjectpermission",
+            name="guardian_gr_content_ae6aec_idx",
         ),
         migrations.RemoveIndex(
-            model_name='userobjectpermission',
-            name='guardian_us_content_179ed2_idx',
+            model_name="userobjectpermission",
+            name="guardian_us_content_179ed2_idx",
         ),
         migrations.AddIndex(
-            model_name='groupobjectpermission',
-            index=models.Index(fields=['permission', 'group', 'content_type', 'object_pk'], name='guardian_gr_permiss_83545c_idx'),
+            model_name="groupobjectpermission",
+            index=models.Index(
+                fields=["permission", "group", "content_type", "object_pk"], name="guardian_gr_permiss_83545c_idx"
+            ),
         ),
         migrations.AddIndex(
-            model_name='groupobjectpermission',
-            index=models.Index(fields=['group', 'content_type', 'object_pk'], name='guardian_gr_group_i_9e7d12_idx'),
+            model_name="groupobjectpermission",
+            index=models.Index(fields=["group", "content_type", "object_pk"], name="guardian_gr_group_i_9e7d12_idx"),
         ),
         migrations.AddIndex(
-            model_name='userobjectpermission',
-            index=models.Index(fields=['permission', 'user', 'content_type', 'object_pk'], name='guardian_us_permiss_e5749c_idx'),
+            model_name="userobjectpermission",
+            index=models.Index(
+                fields=["permission", "user", "content_type", "object_pk"], name="guardian_us_permiss_e5749c_idx"
+            ),
         ),
         migrations.AddIndex(
-            model_name='userobjectpermission',
-            index=models.Index(fields=['user', 'content_type', 'object_pk'], name='guardian_us_user_id_8eae14_idx'),
+            model_name="userobjectpermission",
+            index=models.Index(fields=["user", "content_type", "object_pk"], name="guardian_us_user_id_8eae14_idx"),
         ),
     ]

guardian/shortcuts.py

@@ -379,7 +379,9 @@ def get_users_with_perms(
         return users
 
 
-def get_groups_with_perms(obj: Model, attach_perms: bool = False, only_with_perms_in: Optional[list[str]] = None) -> Union[Group, dict]:
+def get_groups_with_perms(
+    obj: Model, attach_perms: bool = False, only_with_perms_in: Optional[list[str]] = None
+) -> Union[Group, dict]:
     """Get all groups with *any* object permissions for the given `obj`.
 
     Parameters:
@@ -423,10 +425,14 @@ def get_groups_with_perms(obj: Model, attach_perms: bool = False, only_with_perm
         else:
             group_filters = {"%s__content_object" % group_rel_name: obj}
         if only_with_perms_in is not None:
-            permission_ids = Permission.objects.filter(content_type=ctype, codename__in=only_with_perms_in).values_list("id", flat=True)
-            group_filters.update({
-                "%s__permission_id__in" % group_rel_name: permission_ids,
-            })
+            permission_ids = Permission.objects.filter(content_type=ctype, codename__in=only_with_perms_in).values_list(
+                "id", flat=True
+            )
+            group_filters.update(
+                {
+                    "%s__permission_id__in" % group_rel_name: permission_ids,
+                }
+            )
 
         group_rel_model = group_model.group.field.related_model
         return group_rel_model.objects.filter(**group_filters).distinct()

guardian/testapp/migrations/0008_fix_project_timezone.py

@@ -1,19 +1,18 @@
 # Generated by Django 5.2.5 on 2025-08-28 23:39
 
-import django.utils.timezone
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('testapp', '0007_genericgroupobjectpermission'),
+        ("testapp", "0007_genericgroupobjectpermission"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='project',
-            name='created_at',
+            model_name="project",
+            name="created_at",
             field=models.DateTimeField(default=django.utils.timezone.now),
         ),
     ]

guardian/testapp/models.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 import uuid
 
 from django.contrib.admin.models import LogEntry