diff --git a/zerver/actions/create_realm.py b/zerver/actions/create_realm.py index 9dfd82cc98..11d84a93b4 100644 --- a/zerver/actions/create_realm.py +++ b/zerver/actions/create_realm.py @@ -122,8 +122,8 @@ def set_realm_permissions_based_on_org_type(realm: Realm) -> None: def set_default_for_realm_permission_group_settings(realm: Realm) -> None: system_groups_dict = get_role_based_system_groups_dict(realm) - for setting_name, permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items(): - group_name = permissions_configuration.default_group_name + for setting_name, permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items(): + group_name = permission_configuration.default_group_name setattr(realm, setting_name, system_groups_dict[group_name]) realm.save(update_fields=list(Realm.REALM_PERMISSION_GROUP_SETTINGS.keys())) @@ -224,8 +224,8 @@ def do_create_realm( # For now a dummy value of -1 is given to groups fields which # is changed later before the transaction is committed. - for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): - setattr(realm, permissions_configuration.id_field_name, -1) + for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): + setattr(realm, permission_configuration.id_field_name, -1) realm.save() diff --git a/zerver/lib/events.py b/zerver/lib/events.py index 042ff316d1..285142f543 100644 --- a/zerver/lib/events.py +++ b/zerver/lib/events.py @@ -254,9 +254,9 @@ def fetch_initial_state_data( for ( setting_name, - permissions_configuration, + permission_configuration, ) in Realm.REALM_PERMISSION_GROUP_SETTINGS.items(): - state["realm_" + setting_name] = getattr(realm, permissions_configuration.id_field_name) + state["realm_" + setting_name] = getattr(realm, permission_configuration.id_field_name) # Most state is handled via the property_types framework; # these manual entries are for those realm settings that don't diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py index ca39bcd25d..2b879d5390 100644 --- a/zerver/lib/import_realm.py +++ b/zerver/lib/import_realm.py @@ -977,8 +977,8 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea if "zerver_usergroup" not in data: # For now a dummy value of -1 is given to groups fields which # is changed later before the transaction is committed. - for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): - setattr(realm, permissions_configuration.id_field_name, -1) + for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): + setattr(realm, permission_configuration.id_field_name, -1) realm.save() diff --git a/zerver/lib/server_initialization.py b/zerver/lib/server_initialization.py index 8134e8df97..c1e11414c7 100644 --- a/zerver/lib/server_initialization.py +++ b/zerver/lib/server_initialization.py @@ -30,8 +30,8 @@ def create_internal_realm() -> None: # For now a dummy value of -1 is given to groups fields which # is changed later before the transaction is committed. - for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): - setattr(realm, permissions_configuration.id_field_name, -1) + for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): + setattr(realm, permission_configuration.id_field_name, -1) realm.save() RealmAuditLog.objects.create( diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py index e21e4a918c..7b7de77375 100644 --- a/zerver/tests/test_realm.py +++ b/zerver/tests/test_realm.py @@ -925,10 +925,10 @@ class RealmTest(ZulipTestCase): for ( setting_name, - permissions_configuration, + permission_configuration, ) in Realm.REALM_PERMISSION_GROUP_SETTINGS.items(): self.assertEqual( - getattr(realm, setting_name).name, permissions_configuration.default_group_name + getattr(realm, setting_name).name, permission_configuration.default_group_name ) def test_do_create_realm_with_keyword_arguments(self) -> None: diff --git a/zerver/views/realm.py b/zerver/views/realm.py index 8da29511a3..fa41f59327 100644 --- a/zerver/views/realm.py +++ b/zerver/views/realm.py @@ -330,8 +330,8 @@ def update_realm( if k in realm.property_types: req_vars[k] = v - for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): - if k == permissions_configuration.id_field_name: + for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values(): + if k == permission_configuration.id_field_name: req_group_setting_vars[k] = v for k, v in req_vars.items(): @@ -342,8 +342,8 @@ def update_realm( else: data[k] = v - for setting_name, permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items(): - setting_group_id_name = permissions_configuration.id_field_name + for setting_name, permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items(): + setting_group_id_name = permission_configuration.id_field_name assert setting_group_id_name in req_group_setting_vars @@ -355,11 +355,11 @@ def update_realm( user_group_id, user_profile, setting_name=setting_name, - require_system_group=permissions_configuration.require_system_group, - allow_internet_group=permissions_configuration.allow_internet_group, - allow_owners_group=permissions_configuration.allow_owners_group, - allow_nobody_group=permissions_configuration.allow_nobody_group, - allow_everyone_group=permissions_configuration.allow_everyone_group, + require_system_group=permission_configuration.require_system_group, + allow_internet_group=permission_configuration.allow_internet_group, + allow_owners_group=permission_configuration.allow_owners_group, + allow_nobody_group=permission_configuration.allow_nobody_group, + allow_everyone_group=permission_configuration.allow_everyone_group, ) do_change_realm_permission_group_setting( realm, setting_name, user_group, acting_user=user_profile diff --git a/zerver/views/streams.py b/zerver/views/streams.py index 9ee1680e60..82f3ea9c6a 100644 --- a/zerver/views/streams.py +++ b/zerver/views/streams.py @@ -375,9 +375,9 @@ def update_stream_backend( if stream_post_policy is not None: do_change_stream_post_policy(stream, stream_post_policy, acting_user=user_profile) - for setting_name, permissions_configuration in Stream.stream_permission_group_settings.items(): + for setting_name, permission_configuration in Stream.stream_permission_group_settings.items(): request_settings_dict = locals() - setting_group_id_name = permissions_configuration.id_field_name + setting_group_id_name = permission_configuration.id_field_name if setting_group_id_name not in request_settings_dict: # nocoverage continue @@ -394,11 +394,11 @@ def update_stream_backend( user_group_id, user_profile, setting_name=setting_name, - require_system_group=permissions_configuration.require_system_group, - allow_internet_group=permissions_configuration.allow_internet_group, - allow_owners_group=permissions_configuration.allow_owners_group, - allow_nobody_group=permissions_configuration.allow_nobody_group, - allow_everyone_group=permissions_configuration.allow_everyone_group, + require_system_group=permission_configuration.require_system_group, + allow_internet_group=permission_configuration.allow_internet_group, + allow_owners_group=permission_configuration.allow_owners_group, + allow_nobody_group=permission_configuration.allow_nobody_group, + allow_everyone_group=permission_configuration.allow_everyone_group, ) do_change_stream_group_based_setting( stream, setting_name, user_group, acting_user=user_profile