From b7909db987810cc6a28bb1ea482f71bb83e36973 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 6 Jun 2023 13:54:42 -0700 Subject: [PATCH] ruff: Fix PLC0208 Use a sequence type when iterating over values. Signed-off-by: Anders Kaseorg --- zerver/management/commands/add_users_to_streams.py | 2 +- zerver/management/commands/create_default_stream_groups.py | 2 +- zerver/tests/test_auth_backends.py | 4 ++-- zproject/backends.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zerver/management/commands/add_users_to_streams.py b/zerver/management/commands/add_users_to_streams.py index 2d42bba582..73e181bda1 100644 --- a/zerver/management/commands/add_users_to_streams.py +++ b/zerver/management/commands/add_users_to_streams.py @@ -25,7 +25,7 @@ class Command(ZulipBaseCommand): user_profiles = self.get_users(options, realm) stream_names = {stream.strip() for stream in options["streams"].split(",")} - for stream_name in set(stream_names): + for stream_name in stream_names: for user_profile in user_profiles: stream = ensure_stream(realm, stream_name, acting_user=None) _ignore, already_subscribed = bulk_add_subscriptions( diff --git a/zerver/management/commands/create_default_stream_groups.py b/zerver/management/commands/create_default_stream_groups.py index 0763e90d42..d6d7423b3a 100644 --- a/zerver/management/commands/create_default_stream_groups.py +++ b/zerver/management/commands/create_default_stream_groups.py @@ -40,7 +40,7 @@ Create default stream groups which the users can choose during sign up. streams = [] stream_names = {stream.strip() for stream in options["streams"].split(",")} - for stream_name in set(stream_names): + for stream_name in stream_names: stream = ensure_stream(realm, stream_name, acting_user=None) streams.append(stream) diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py index 6aaa8a43d0..d1ae95657d 100644 --- a/zerver/tests/test_auth_backends.py +++ b/zerver/tests/test_auth_backends.py @@ -1588,7 +1588,7 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase, ABC): stream_names = ["new_stream_1", "new_stream_2"] streams = [] - for stream_name in set(stream_names): + for stream_name in stream_names: stream = ensure_stream(realm, stream_name, acting_user=None) streams.append(stream) @@ -4599,7 +4599,7 @@ class GoogleAuthBackendTest(SocialAuthBase): stream_names = ["new_stream_1", "new_stream_2"] streams = [] - for stream_name in set(stream_names): + for stream_name in stream_names: stream = ensure_stream(realm, stream_name, acting_user=None) streams.append(stream) diff --git a/zproject/backends.py b/zproject/backends.py index e4b90ca38b..87dbd731e5 100644 --- a/zproject/backends.py +++ b/zproject/backends.py @@ -867,7 +867,7 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend): if "full_name" in settings.AUTH_LDAP_USER_ATTR_MAP: full_name_attr = settings.AUTH_LDAP_USER_ATTR_MAP["full_name"] full_name = ldap_user.attrs[full_name_attr][0] - elif all(key in settings.AUTH_LDAP_USER_ATTR_MAP for key in {"first_name", "last_name"}): + elif all(key in settings.AUTH_LDAP_USER_ATTR_MAP for key in ["first_name", "last_name"]): first_name_attr = settings.AUTH_LDAP_USER_ATTR_MAP["first_name"] last_name_attr = settings.AUTH_LDAP_USER_ATTR_MAP["last_name"] first_name = ldap_user.attrs[first_name_attr][0]