From 96be7b72c277121a87f6066bd0c7332bf1b61987 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 2 Aug 2023 17:09:35 -0700 Subject: [PATCH] ruff: Collapse short multi-line import statements. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit isort did this by default, though it’s unclear whether that was intended; see https://github.com/astral-sh/ruff/issues/4153. Signed-off-by: Anders Kaseorg (cherry picked from commit 733083c65dd6c2948a1d5d681a207a2fbf691814) --- pyproject.toml | 1 + .../tests/test_delete_unclaimed_attachments.py | 8 +------- zerver/tests/test_invite.py | 6 +----- zerver/tests/test_signup.py | 11 ++--------- zerver/tests/test_upload_local.py | 18 +++--------------- zerver/tests/test_upload_s3.py | 8 +------- zerver/tests/test_user_topics.py | 5 +---- zerver/views/message_send.py | 8 +------- zerver/views/report.py | 6 +----- zerver/views/sentry.py | 5 +---- zproject/urls.py | 4 +--- 11 files changed, 14 insertions(+), 66 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 95f7be1c22..5585fc7e6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -176,3 +176,4 @@ extend-function-names = ["gettext_lazy"] [tool.ruff.isort] known-third-party = ["zulip"] +split-on-trailing-comma = false diff --git a/zerver/tests/test_delete_unclaimed_attachments.py b/zerver/tests/test_delete_unclaimed_attachments.py index ad1677baf2..f076964990 100644 --- a/zerver/tests/test_delete_unclaimed_attachments.py +++ b/zerver/tests/test_delete_unclaimed_attachments.py @@ -13,13 +13,7 @@ from zerver.actions.scheduled_messages import check_schedule_message, delete_sch from zerver.actions.uploads import do_delete_old_unclaimed_attachments from zerver.lib.retention import clean_archived_data from zerver.lib.test_classes import UploadSerializeMixin, ZulipTestCase -from zerver.models import ( - ArchivedAttachment, - Attachment, - Message, - UserProfile, - get_client, -) +from zerver.models import ArchivedAttachment, Attachment, Message, UserProfile, get_client class UnclaimedAttachmentTest(UploadSerializeMixin, ZulipTestCase): diff --git a/zerver/tests/test_invite.py b/zerver/tests/test_invite.py index 95e8006e26..c53c310cc4 100644 --- a/zerver/tests/test_invite.py +++ b/zerver/tests/test_invite.py @@ -37,11 +37,7 @@ from zerver.actions.realm_settings import do_change_realm_plan_type, do_set_real from zerver.actions.user_settings import do_change_full_name from zerver.actions.users import change_user_is_active from zerver.context_processors import common_context -from zerver.lib.send_email import ( - FromAddress, - deliver_scheduled_emails, - send_future_email, -) +from zerver.lib.send_email import FromAddress, deliver_scheduled_emails, send_future_email from zerver.lib.test_classes import ZulipTestCase from zerver.lib.test_helpers import find_key_by_email from zerver.models import ( diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 40f8188030..3c09e15adc 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -18,10 +18,7 @@ from django.utils import translation from django.utils.translation import gettext as _ from confirmation import settings as confirmation_settings -from confirmation.models import ( - Confirmation, - one_click_unsubscribe_link, -) +from confirmation.models import Confirmation, one_click_unsubscribe_link from zerver.actions.create_realm import do_change_realm_subdomain, do_create_realm from zerver.actions.create_user import add_new_user_history from zerver.actions.default_streams import ( @@ -50,11 +47,7 @@ from zerver.lib.mobile_auth_otp import ( xor_hex_strings, ) from zerver.lib.name_restrictions import is_disposable_domain -from zerver.lib.send_email import ( - EmailNotDeliveredError, - FromAddress, - send_future_email, -) +from zerver.lib.send_email import EmailNotDeliveredError, FromAddress, send_future_email from zerver.lib.stream_subscription import get_stream_subscriptions_for_user from zerver.lib.streams import create_stream_if_needed from zerver.lib.subdomains import is_root_domain_available diff --git a/zerver/tests/test_upload_local.py b/zerver/tests/test_upload_local.py index 034ea92322..c0d6de0bf8 100644 --- a/zerver/tests/test_upload_local.py +++ b/zerver/tests/test_upload_local.py @@ -10,10 +10,7 @@ from PIL import Image import zerver.lib.upload from zerver.lib.avatar_hash import user_avatar_path from zerver.lib.test_classes import UploadSerializeMixin, ZulipTestCase -from zerver.lib.test_helpers import ( - get_test_image_file, - read_test_image_file, -) +from zerver.lib.test_helpers import get_test_image_file, read_test_image_file from zerver.lib.upload import ( all_message_attachments, delete_export_tarball, @@ -24,18 +21,9 @@ from zerver.lib.upload import ( upload_export_tarball, upload_message_attachment, ) -from zerver.lib.upload.base import ( - DEFAULT_EMOJI_SIZE, - MEDIUM_AVATAR_SIZE, - resize_avatar, -) +from zerver.lib.upload.base import DEFAULT_EMOJI_SIZE, MEDIUM_AVATAR_SIZE, resize_avatar from zerver.lib.upload.local import write_local_file -from zerver.models import ( - Attachment, - RealmEmoji, - get_realm, - get_system_bot, -) +from zerver.models import Attachment, RealmEmoji, get_realm, get_system_bot class LocalStorageTest(UploadSerializeMixin, ZulipTestCase): diff --git a/zerver/tests/test_upload_s3.py b/zerver/tests/test_upload_s3.py index 005aa5e2ed..e30598db70 100644 --- a/zerver/tests/test_upload_s3.py +++ b/zerver/tests/test_upload_s3.py @@ -36,13 +36,7 @@ from zerver.lib.upload.base import ( resize_avatar, ) from zerver.lib.upload.s3 import S3UploadBackend -from zerver.models import ( - Attachment, - RealmEmoji, - UserProfile, - get_realm, - get_system_bot, -) +from zerver.models import Attachment, RealmEmoji, UserProfile, get_realm, get_system_bot class S3Test(ZulipTestCase): diff --git a/zerver/tests/test_user_topics.py b/zerver/tests/test_user_topics.py index 78ab509d65..b98aeb9b42 100644 --- a/zerver/tests/test_user_topics.py +++ b/zerver/tests/test_user_topics.py @@ -7,10 +7,7 @@ from django.utils.timezone import now as timezone_now from zerver.actions.user_topics import do_set_user_topic_visibility_policy from zerver.lib.stream_topic import StreamTopicTarget from zerver.lib.test_classes import ZulipTestCase -from zerver.lib.user_topics import ( - get_topic_mutes, - topic_has_visibility_policy, -) +from zerver.lib.user_topics import get_topic_mutes, topic_has_visibility_policy from zerver.models import UserProfile, UserTopic, get_stream diff --git a/zerver/views/message_send.py b/zerver/views/message_send.py index 0171d4b363..994819a30d 100644 --- a/zerver/views/message_send.py +++ b/zerver/views/message_send.py @@ -22,13 +22,7 @@ from zerver.lib.topic import REQ_topic from zerver.lib.validator import check_string_in, to_float from zerver.lib.zcommand import process_zcommands from zerver.lib.zephyr import compute_mit_user_fullname -from zerver.models import ( - Client, - Message, - RealmDomain, - UserProfile, - get_user_including_cross_realm, -) +from zerver.models import Client, Message, RealmDomain, UserProfile, get_user_including_cross_realm class InvalidMirrorInputError(Exception): diff --git a/zerver/views/report.py b/zerver/views/report.py index 4f7df6d89b..ee886380b8 100644 --- a/zerver/views/report.py +++ b/zerver/views/report.py @@ -7,11 +7,7 @@ from django.views.decorators.http import require_POST from zerver.lib.request import REQ, has_request_variables from zerver.lib.response import json_success -from zerver.lib.validator import ( - WildValue, - check_string, - to_wild_value, -) +from zerver.lib.validator import WildValue, check_string, to_wild_value @csrf_exempt diff --git a/zerver/views/sentry.py b/zerver/views/sentry.py index a0c5b31cab..cd80f75f32 100644 --- a/zerver/views/sentry.py +++ b/zerver/views/sentry.py @@ -9,10 +9,7 @@ from django.views.decorators.csrf import csrf_exempt from zerver.lib.exceptions import JsonableError from zerver.lib.outgoing_http import OutgoingSession -from zerver.lib.validator import ( - check_url, - to_wild_value, -) +from zerver.lib.validator import check_url, to_wild_value class SentryTunnelSession(OutgoingSession): diff --git a/zproject/urls.py b/zproject/urls.py index 31c25906bf..5a43157d67 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -130,9 +130,7 @@ from zerver.views.registration import ( realm_register, signup_send_confirm, ) -from zerver.views.report import ( - report_csp_violations, -) +from zerver.views.report import report_csp_violations from zerver.views.scheduled_messages import ( create_scheduled_message_backend, delete_scheduled_messages,