ruff: Bump target-version from py38 to py310.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

analytics/tests/test_counts.py

@@ -1432,12 +1432,16 @@ def test_mobile_pushes_received_count(self) -> None:
             "gcm_options": gcm_options,
         }
         now = timezone_now()
-        with time_machine.travel(now, tick=False), mock.patch(
-            "zilencer.views.send_android_push_notification", return_value=1
-        ), mock.patch("zilencer.views.send_apple_push_notification", return_value=1), mock.patch(
-            "corporate.lib.stripe.RemoteServerBillingSession.current_count_for_billed_licenses",
-            return_value=10,
-        ), self.assertLogs("zilencer.views", level="INFO"):
+        with (
+            time_machine.travel(now, tick=False),
+            mock.patch("zilencer.views.send_android_push_notification", return_value=1),
+            mock.patch("zilencer.views.send_apple_push_notification", return_value=1),
+            mock.patch(
+                "corporate.lib.stripe.RemoteServerBillingSession.current_count_for_billed_licenses",
+                return_value=10,
+            ),
+            self.assertLogs("zilencer.views", level="INFO"),
+        ):
             result = self.uuid_post(
                 self.server_uuid,
                 "/api/v1/remotes/push/notify",
@@ -1491,12 +1495,16 @@ def test_mobile_pushes_received_count(self) -> None:
             "apns_payload": apns_payload,
             "gcm_options": gcm_options,
         }
-        with time_machine.travel(now, tick=False), mock.patch(
-            "zilencer.views.send_android_push_notification", return_value=1
-        ), mock.patch("zilencer.views.send_apple_push_notification", return_value=1), mock.patch(
-            "corporate.lib.stripe.RemoteServerBillingSession.current_count_for_billed_licenses",
-            return_value=10,
-        ), self.assertLogs("zilencer.views", level="INFO"):
+        with (
+            time_machine.travel(now, tick=False),
+            mock.patch("zilencer.views.send_android_push_notification", return_value=1),
+            mock.patch("zilencer.views.send_apple_push_notification", return_value=1),
+            mock.patch(
+                "corporate.lib.stripe.RemoteServerBillingSession.current_count_for_billed_licenses",
+                return_value=10,
+            ),
+            self.assertLogs("zilencer.views", level="INFO"),
+        ):
             result = self.uuid_post(
                 self.server_uuid,
                 "/api/v1/remotes/push/notify",
@@ -1549,12 +1557,16 @@ def test_mobile_pushes_received_count(self) -> None:
             realm_date_created=realm.date_created,
         )
 
-        with time_machine.travel(now, tick=False), mock.patch(
-            "zilencer.views.send_android_push_notification", return_value=1
-        ), mock.patch("zilencer.views.send_apple_push_notification", return_value=1), mock.patch(
-            "corporate.lib.stripe.RemoteRealmBillingSession.current_count_for_billed_licenses",
-            return_value=10,
-        ), self.assertLogs("zilencer.views", level="INFO"):
+        with (
+            time_machine.travel(now, tick=False),
+            mock.patch("zilencer.views.send_android_push_notification", return_value=1),
+            mock.patch("zilencer.views.send_apple_push_notification", return_value=1),
+            mock.patch(
+                "corporate.lib.stripe.RemoteRealmBillingSession.current_count_for_billed_licenses",
+                return_value=10,
+            ),
+            self.assertLogs("zilencer.views", level="INFO"),
+        ):
             result = self.uuid_post(
                 self.server_uuid,
                 "/api/v1/remotes/push/notify",

corporate/lib/stripe_event_handler.py

@@ -112,7 +112,7 @@ def handle_checkout_session_completed_event(
         session.customer, stripe_session.metadata.get("user_id")
     )
     payment_method = stripe_setup_intent.payment_method
-    assert isinstance(payment_method, (str, type(None)))
+    assert isinstance(payment_method, (str, type(None)))  # noqa: UP038  # https://github.com/python/mypy/issues/17413
 
     if session.type in [
         Session.CARD_UPDATE_FROM_BILLING_PAGE,

corporate/tests/test_remote_billing.py

@@ -283,9 +283,10 @@ class RemoteBillingAuthenticationTest(RemoteRealmBillingTestCase):
     def test_self_hosted_config_error_page(self) -> None:
         self.login("desdemona")
 
-        with self.settings(
-            CORPORATE_ENABLED=False, PUSH_NOTIFICATION_BOUNCER_URL=None
-        ), self.assertLogs("django.request"):
+        with (
+            self.settings(CORPORATE_ENABLED=False, PUSH_NOTIFICATION_BOUNCER_URL=None),
+            self.assertLogs("django.request"),
+        ):
             result = self.client_get("/self-hosted-billing/not-configured/")
             self.assertEqual(result.status_code, 500)
             self.assert_in_response(
@@ -703,9 +704,10 @@ def test_remote_billing_authentication_flow_generate_two_confirmation_links_befo
         # Now click the second confirmation link. The RemoteRealmBillingUser entry
         # stays the same, since it's already been created, and the user is redirected
         # normally further through the flow, while we log this event.
-        with time_machine.travel(now + timedelta(seconds=1), tick=False), self.assertLogs(
-            "corporate.stripe", "INFO"
-        ) as mock_logger:
+        with (
+            time_machine.travel(now + timedelta(seconds=1), tick=False),
+            self.assertLogs("corporate.stripe", "INFO") as mock_logger,
+        ):
             result = self.client_get(second_confirmation_url, subdomain="selfhosting")
         self.assertEqual(result.status_code, 302)
         self.assertTrue(result["Location"].startswith("/remote-billing-login/"))

corporate/tests/test_stripe.py

@@ -2253,10 +2253,13 @@ def test_upgrade_with_uncaught_exception(self, *mock_args: Any) -> None:
         hamlet = self.example_user("hamlet")
         self.login_user(hamlet)
         self.add_card_to_customer_for_upgrade()
-        with patch(
-            "corporate.lib.stripe.BillingSession.create_stripe_invoice_and_charge",
-            side_effect=Exception,
-        ), self.assertLogs("corporate.stripe", "WARNING") as m:
+        with (
+            patch(
+                "corporate.lib.stripe.BillingSession.create_stripe_invoice_and_charge",
+                side_effect=Exception,
+            ),
+            self.assertLogs("corporate.stripe", "WARNING") as m,
+        ):
             response = self.upgrade(talk_to_stripe=False)
             self.assertIn("ERROR:corporate.stripe:Uncaught exception in billing", m.output[0])
             self.assertIn(m.records[0].stack_info, m.output[0])
@@ -2273,9 +2276,12 @@ def test_invoice_payment_succeeded_event_with_uncaught_exception(self, *mock_arg
         self.login_user(hamlet)
         self.add_card_to_customer_for_upgrade()
 
-        with patch(
-            "corporate.lib.stripe.BillingSession.process_initial_upgrade", side_effect=Exception
-        ), self.assertLogs("corporate.stripe", "WARNING"):
+        with (
+            patch(
+                "corporate.lib.stripe.BillingSession.process_initial_upgrade", side_effect=Exception
+            ),
+            self.assertLogs("corporate.stripe", "WARNING"),
+        ):
             response = self.upgrade()
 
         response_dict = self.assert_json_success(response)
@@ -2609,9 +2615,10 @@ def test_redirect_for_billing_page_downgrade_at_free_trial_end(self, *mocks: Moc
                 self.assert_in_response(substring, response)
 
             # schedule downgrade
-            with time_machine.travel(self.now + timedelta(days=3), tick=False), self.assertLogs(
-                "corporate.stripe", "INFO"
-            ) as m:
+            with (
+                time_machine.travel(self.now + timedelta(days=3), tick=False),
+                self.assertLogs("corporate.stripe", "INFO") as m,
+            ):
                 response = self.client_billing_patch(
                     "/billing/plan",
                     {"status": CustomerPlan.DOWNGRADE_AT_END_OF_FREE_TRIAL},
@@ -3927,9 +3934,10 @@ def test_reupgrade_by_billing_admin_after_downgrade(self) -> None:
             expected_log = f"INFO:corporate.stripe:Change plan status: Customer.id: {stripe_customer_id}, CustomerPlan.id: {new_plan.id}, status: {CustomerPlan.DOWNGRADE_AT_END_OF_CYCLE}"
             self.assertEqual(m.output[0], expected_log)
 
-        with self.assertRaises(BillingError) as context, self.assertLogs(
-            "corporate.stripe", "WARNING"
-        ) as m:
+        with (
+            self.assertRaises(BillingError) as context,
+            self.assertLogs("corporate.stripe", "WARNING") as m,
+        ):
             with time_machine.travel(self.now, tick=False):
                 self.local_upgrade(
                     self.seat_count, True, CustomerPlan.BILLING_SCHEDULE_ANNUAL, True, False
@@ -7010,9 +7018,10 @@ def test_redirect_for_remote_realm_billing_page_downgrade_at_free_trial_end(
                 self.assert_in_response(substring, response)
 
             # schedule downgrade
-            with time_machine.travel(self.now + timedelta(days=3), tick=False), self.assertLogs(
-                "corporate.stripe", "INFO"
-            ) as m:
+            with (
+                time_machine.travel(self.now + timedelta(days=3), tick=False),
+                self.assertLogs("corporate.stripe", "INFO") as m,
+            ):
                 response = self.client_billing_patch(
                     "/billing/plan",
                     {"status": CustomerPlan.DOWNGRADE_AT_END_OF_FREE_TRIAL},
@@ -7400,8 +7409,9 @@ def test_upgrade_user_to_fixed_price_plan_pay_by_invoice(self, *mocks: Mock) ->
         self.execute_remote_billing_authentication_flow(hamlet)
         mock_invoice = MagicMock()
         mock_invoice.hosted_invoice_url = "payments_page_url"
-        with time_machine.travel(self.now, tick=False), mock.patch(
-            "stripe.Invoice.retrieve", return_value=mock_invoice
+        with (
+            time_machine.travel(self.now, tick=False),
+            mock.patch("stripe.Invoice.retrieve", return_value=mock_invoice),
         ):
             result = self.client_get(
                 f"{self.billing_session.billing_base_url}/upgrade/?tier={CustomerPlan.TIER_SELF_HOSTED_BASIC}",
@@ -8894,9 +8904,10 @@ def test_redirect_for_remote_server_billing_page_downgrade_at_free_trial_end(
                 self.assert_in_response(substring, response)
 
             # schedule downgrade
-            with time_machine.travel(self.now + timedelta(days=3), tick=False), self.assertLogs(
-                "corporate.stripe", "INFO"
-            ) as m:
+            with (
+                time_machine.travel(self.now + timedelta(days=3), tick=False),
+                self.assertLogs("corporate.stripe", "INFO") as m,
+            ):
                 response = self.client_billing_patch(
                     "/billing/plan",
                     {"status": CustomerPlan.DOWNGRADE_AT_END_OF_FREE_TRIAL},
@@ -9210,8 +9221,9 @@ def test_upgrade_server_to_fixed_price_plan_pay_by_invoice(self, *mocks: Mock) -
         self.execute_remote_billing_authentication_flow(hamlet.delivery_email, hamlet.full_name)
         mock_invoice = MagicMock()
         mock_invoice.hosted_invoice_url = "payments_page_url"
-        with time_machine.travel(self.now, tick=False), mock.patch(
-            "stripe.Invoice.retrieve", return_value=mock_invoice
+        with (
+            time_machine.travel(self.now, tick=False),
+            mock.patch("stripe.Invoice.retrieve", return_value=mock_invoice),
         ):
             result = self.client_get(
                 f"{self.billing_session.billing_base_url}/upgrade/?tier={CustomerPlan.TIER_SELF_HOSTED_BASIC}",
@@ -9663,9 +9675,11 @@ def test_legacy_plan_ends_on_plan_end_date(self, *mocks: Mock) -> None:
             self.remote_server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_MANAGED_LEGACY
         )
 
-        with mock.patch("stripe.Invoice.create") as invoice_create, mock.patch(
-            "corporate.lib.stripe.send_email"
-        ) as send_email, time_machine.travel(plan_end_date, tick=False):
+        with (
+            mock.patch("stripe.Invoice.create") as invoice_create,
+            mock.patch("corporate.lib.stripe.send_email") as send_email,
+            time_machine.travel(plan_end_date, tick=False),
+        ):
             invoice_plans_as_needed()
             # Verify that for legacy plan with no next plan scheduled,
             # invoice overdue email is not sent even if the last audit log
@@ -9730,9 +9744,11 @@ def test_invoice_scheduled_upgrade_server_legacy_plan(self, *mocks: Mock) -> Non
         )
         licenses = max(min_licenses, server_user_count)
 
-        with mock.patch("stripe.Invoice.finalize_invoice") as invoice_create, mock.patch(
-            "corporate.lib.stripe.send_email"
-        ) as send_email, time_machine.travel(end_date, tick=False):
+        with (
+            mock.patch("stripe.Invoice.finalize_invoice") as invoice_create,
+            mock.patch("corporate.lib.stripe.send_email") as send_email,
+            time_machine.travel(end_date, tick=False),
+        ):
             invoice_plans_as_needed()
             # Verify that for legacy plan with next plan scheduled, invoice
             # overdue email is sent if the last audit log is stale.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 100
-target-version = ["py38"]
+target-version = ["py310"]
 
 [tool.isort]
 src_paths = [".", "tools"]
@@ -99,7 +99,7 @@ warn_required_dynamic_aliases = true
 [tool.ruff]
 line-length = 100
 src = [".", "tools"]
-target-version = "py38"
+target-version = "py310"
 
 [tool.ruff.lint]
 # See https://github.com/astral-sh/ruff#rules for error code definitions.

scripts/lib/sharding.py

@@ -33,9 +33,10 @@ def write_updated_configs() -> None:
     expected_ports = list(range(9800, ports[-1] + 1))
     assert ports == expected_ports, f"ports ({ports}) must be contiguous, starting with 9800"
 
-    with open("/etc/zulip/nginx_sharding_map.conf.tmp", "w") as nginx_sharding_conf_f, open(
-        "/etc/zulip/sharding.json.tmp", "w"
-    ) as sharding_json_f:
+    with (
+        open("/etc/zulip/nginx_sharding_map.conf.tmp", "w") as nginx_sharding_conf_f,
+        open("/etc/zulip/sharding.json.tmp", "w") as sharding_json_f,
+    ):
         if len(ports) == 1:
             nginx_sharding_conf_f.write('map "" $tornado_server {\n')
             nginx_sharding_conf_f.write("    default http://tornado;\n")

scripts/lib/zulip_tools.py

@@ -15,13 +15,12 @@
 import sys
 import time
 import uuid
+import zoneinfo
 from collections.abc import Sequence
 from datetime import datetime, timedelta
 from typing import IO, Any, Literal, overload
 from urllib.parse import SplitResult
 
-import zoneinfo
-
 DEPLOYMENTS_DIR = "/home/zulip/deployments"
 LOCK_DIR = os.path.join(DEPLOYMENTS_DIR, "lock")
 TIMESTAMP_FORMAT = "%Y-%m-%d-%H-%M-%S"

tools/setup/build_timezone_values

@@ -2,7 +2,6 @@
 import json
 import os
 import sys
-
 import zoneinfo
 
 ZULIP_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../")

tools/test-help-documentation

@@ -58,8 +58,9 @@ def vnu_servlet() -> Iterator[None]:
         proc.terminate()
 
 
-with vnu_servlet(), test_server_running(
-    options.skip_provision_check, external_host, log_file=LOG_FILE, dots=True
+with (
+    vnu_servlet(),
+    test_server_running(options.skip_provision_check, external_host, log_file=LOG_FILE, dots=True),
 ):
     ret_help_doc = subprocess.call(
         ["scrapy", "crawl_with_status", *extra_args, "help_documentation_crawler"],

tools/tests/test_zulint_custom_rules.py

@@ -58,9 +58,10 @@ def test_rule_patterns(self) -> None:
 
             for line in rule.get("bad_lines", []):
                 for filename in rule.get("include_only", {"foo.bar"}):
-                    with patch(
-                        "builtins.open", return_value=StringIO(line + "\n\n"), autospec=True
-                    ), patch("builtins.print"):
+                    with (
+                        patch("builtins.open", return_value=StringIO(line + "\n\n"), autospec=True),
+                        patch("builtins.print"),
+                    ):
                         self.assertTrue(
                             RuleList([], [rule]).custom_check_file(filename, "baz", ""),
                             f"The pattern '{pattern}' didn't match the line '{line}' while it should.",

zerver/actions/realm_settings.py

@@ -1,8 +1,8 @@
 import logging
+import zoneinfo
 from email.headerregistry import Address
 from typing import Any, Literal
 
-import zoneinfo
 from django.conf import settings
 from django.db import transaction
 from django.utils.timezone import get_current_timezone_name as timezone_get_current_timezone_name

zerver/lib/email_notifications.py

@@ -5,14 +5,14 @@
 import re
 import subprocess
 import sys
+import zoneinfo
 from collections import defaultdict
 from dataclasses import dataclass
 from datetime import timedelta
 from email.headerregistry import Address
 from typing import Any
 
 import lxml.html
-import zoneinfo
 from bs4 import BeautifulSoup
 from django.conf import settings
 from django.contrib.auth import get_backends

zerver/lib/test_classes.py

@@ -226,9 +226,10 @@ def run(self, result: TestResult | None = None) -> TestResult | None:  # nocover
         if not settings.BAN_CONSOLE_OUTPUT and self.expected_console_output is None:
             return super().run(result)
         extra_output_finder = ExtraConsoleOutputFinder()
-        with tee_stderr_and_find_extra_console_output(
-            extra_output_finder
-        ), tee_stdout_and_find_extra_console_output(extra_output_finder):
+        with (
+            tee_stderr_and_find_extra_console_output(extra_output_finder),
+            tee_stdout_and_find_extra_console_output(extra_output_finder),
+        ):
             test_result = super().run(result)
         if extra_output_finder.full_extra_output and (
             test_result is None or test_result.wasSuccessful()
@@ -1567,9 +1568,13 @@ def simulated_markdown_failure(self) -> Iterator[None]:
         This raises a failure inside of the try/except block of
         markdown.__init__.do_convert.
         """
-        with mock.patch(
-            "zerver.lib.markdown.unsafe_timeout", side_effect=subprocess.CalledProcessError(1, [])
-        ), self.assertLogs(level="ERROR"):  # For markdown_logger.exception
+        with (
+            mock.patch(
+                "zerver.lib.markdown.unsafe_timeout",
+                side_effect=subprocess.CalledProcessError(1, []),
+            ),
+            self.assertLogs(level="ERROR"),
+        ):  # For markdown_logger.exception
             yield
 
     def create_default_device(