ruff: Fix UP035 Import from collections.abc, typing instead.

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

Author: andersk

analytics/lib/counts.py

@@ -1,13 +1,14 @@
 import logging
 import time
 from collections import OrderedDict, defaultdict
+from collections.abc import Callable, Sequence
 from datetime import datetime, timedelta
-from typing import Callable, Sequence, Union
+from typing import TypeAlias, Union
 
 from django.conf import settings
 from django.db import connection, models
 from psycopg2.sql import SQL, Composable, Identifier, Literal
-from typing_extensions import TypeAlias, override
+from typing_extensions import override
 
 from analytics.models import (
     BaseCount,

analytics/management/commands/populate_analytics_db.py

@@ -1,9 +1,10 @@
+from collections.abc import Mapping
 from datetime import timedelta
-from typing import Any, Mapping
+from typing import Any, TypeAlias
 
 from django.core.files.uploadedfile import UploadedFile
 from django.utils.timezone import now as timezone_now
-from typing_extensions import TypeAlias, override
+from typing_extensions import override
 
 from analytics.lib.counts import COUNT_STATS, CountStat, do_drop_all_analytics_tables
 from analytics.lib.fixtures import generate_time_series_data

analytics/tests/test_counts.py

@@ -1,6 +1,7 @@
+from collections.abc import Iterator
 from contextlib import AbstractContextManager, ExitStack, contextmanager
 from datetime import datetime, timedelta, timezone
-from typing import Any, Iterator
+from typing import Any
 from unittest import mock
 
 import time_machine

analytics/views/stats.py

@@ -1,7 +1,7 @@
 import logging
 from collections import defaultdict
 from datetime import datetime, timedelta, timezone
-from typing import Any, Optional, TypeVar, cast
+from typing import Any, Optional, TypeAlias, TypeVar, cast
 
 from django.conf import settings
 from django.db.models import QuerySet
@@ -10,7 +10,6 @@
 from django.utils import translation
 from django.utils.timezone import now as timezone_now
 from django.utils.translation import gettext as _
-from typing_extensions import TypeAlias
 
 from analytics.lib.counts import COUNT_STATS, CountStat
 from analytics.lib.time_utils import time_range

confirmation/models.py

@@ -3,8 +3,9 @@
 __revision__ = "$Id: models.py 28 2009-10-22 15:03:02Z jarek.zgoda $"
 import secrets
 from base64 import b32encode
+from collections.abc import Mapping
 from datetime import timedelta
-from typing import Mapping, Optional, Union, cast
+from typing import Optional, TypeAlias, Union, cast
 from urllib.parse import urljoin
 
 from django.conf import settings
@@ -16,7 +17,7 @@
 from django.template.response import TemplateResponse
 from django.urls import reverse
 from django.utils.timezone import now as timezone_now
-from typing_extensions import TypeAlias, override
+from typing_extensions import override
 
 from confirmation import settings as confirmation_settings
 from zerver.lib.types import UnspecifiedValue

corporate/lib/activity.py

@@ -1,8 +1,9 @@
 from collections import defaultdict
+from collections.abc import Callable, Sequence
 from dataclasses import dataclass
 from datetime import datetime
 from decimal import Decimal
-from typing import Any, Callable, Sequence
+from typing import Any
 from urllib.parse import urlencode
 
 from django.conf import settings

corporate/lib/decorator.py

@@ -1,12 +1,13 @@
+from collections.abc import Callable
 from functools import wraps
-from typing import Callable
+from typing import Concatenate
 from urllib.parse import urlencode, urljoin
 
 from django.conf import settings
 from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, JsonResponse
 from django.shortcuts import render
 from django.urls import reverse
-from typing_extensions import Concatenate, ParamSpec
+from typing_extensions import ParamSpec
 
 from corporate.lib.remote_billing_util import (
     RemoteBillingIdentityExpiredError,

corporate/lib/stripe.py

@@ -3,12 +3,13 @@
 import os
 import secrets
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Generator
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
 from decimal import Decimal
 from enum import Enum
 from functools import wraps
-from typing import Any, Callable, Generator, Literal, TypedDict, TypeVar
+from typing import Any, Literal, TypedDict, TypeVar
 from urllib.parse import urlencode, urljoin
 
 import stripe

corporate/lib/stripe_event_handler.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import stripe
 from django.conf import settings

corporate/tests/test_stripe.py

@@ -6,11 +6,12 @@
 import sys
 import typing
 import uuid
+from collections.abc import Callable, Mapping, Sequence
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
 from decimal import Decimal
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, Literal, Mapping, Optional, Sequence, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Literal, Optional, TypeVar, cast
 from unittest import mock
 from unittest.mock import MagicMock, Mock, patch
 

corporate/views/billing_page.py

@@ -1,12 +1,11 @@
 import logging
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
 
 from django.http import HttpRequest, HttpResponse, HttpResponseNotAllowed, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from pydantic import AfterValidator, Json
-from typing_extensions import Annotated
 
 from corporate.lib.decorator import (
     authenticated_remote_realm_management_endpoint,

corporate/views/realm_activity.py

@@ -1,8 +1,9 @@
 import itertools
 import re
+from collections.abc import Collection
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Collection
+from typing import Any
 
 from django.db.models import QuerySet
 from django.http import HttpRequest, HttpResponse, HttpResponseNotFound

corporate/views/remote_billing_page.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Literal, cast
+from typing import Any, Literal, TypeAlias, cast
 from urllib.parse import urlsplit, urlunsplit
 
 from django.conf import settings
@@ -15,7 +15,6 @@
 from django.utils.translation import gettext as _
 from django.views.decorators.csrf import csrf_exempt
 from pydantic import Json
-from typing_extensions import TypeAlias
 
 from confirmation.models import (
     Confirmation,

corporate/views/support.py

@@ -1,9 +1,10 @@
 import uuid
+from collections.abc import Iterable
 from contextlib import suppress
 from dataclasses import dataclass
 from datetime import timedelta
 from operator import attrgetter
-from typing import Any, Iterable
+from typing import Annotated, Any, Literal
 from urllib.parse import urlencode, urlsplit
 
 from django import forms
@@ -18,7 +19,6 @@
 from django.utils.timezone import now as timezone_now
 from django.utils.translation import gettext as _
 from pydantic import AfterValidator, Json, NonNegativeInt
-from typing_extensions import Annotated, Literal
 
 from confirmation.models import Confirmation, confirmation_url
 from confirmation.settings import STATUS_USED

corporate/views/upgrade.py

@@ -1,10 +1,10 @@
 import logging
+from typing import Annotated
 
 from django.conf import settings
 from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from pydantic import AfterValidator, Json
-from typing_extensions import Annotated
 
 from corporate.lib.decorator import (
     authenticated_remote_realm_management_endpoint,

puppet/kandra/files/memcached_exporter

@@ -3,7 +3,8 @@
 import contextlib
 import sys
 import time
-from typing import Any, Iterable, Sequence
+from collections.abc import Iterable, Sequence
+from typing import Any
 
 sys.path.append("/home/zulip/deployments/current")
 from scripts.lib.setup_path import setup_path

puppet/zulip/files/postgresql/wal-g-exporter

@@ -7,9 +7,10 @@ import os
 import subprocess
 import sys
 from collections import defaultdict
+from collections.abc import Mapping
 from datetime import datetime, timedelta, timezone
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from typing import Mapping, Protocol
+from typing import Protocol
 from urllib.parse import parse_qs, urlsplit
 
 

scripts/lib/hash_reqs.py

@@ -4,7 +4,7 @@
 import os
 import subprocess
 import sys
-from typing import Iterable
+from collections.abc import Iterable
 
 
 def expand_reqs_helper(fpath: str) -> list[str]:

scripts/lib/zulip_tools.py

@@ -15,8 +15,9 @@
 import sys
 import time
 import uuid
+from collections.abc import Sequence
 from datetime import datetime, timedelta
-from typing import IO, Any, Literal, Sequence, overload
+from typing import IO, Any, Literal, overload
 from urllib.parse import SplitResult
 
 import zoneinfo

scripts/log-search

@@ -10,7 +10,8 @@ import signal
 import sys
 from datetime import date, datetime, timedelta, timezone
 from enum import Enum, auto
-from typing import Match, TextIO
+from re import Match
+from typing import TextIO
 
 ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(ZULIP_PATH)

tools/check-schemas

@@ -14,7 +14,8 @@ import difflib
 import os
 import subprocess
 import sys
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import orjson
 

tools/check-templates

@@ -11,7 +11,7 @@ from tools.lib import sanity_check
 
 sanity_check.check_venv(__file__)
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from zulint import lister
 

tools/diagnose

@@ -4,7 +4,7 @@ import platform
 import shlex
 import subprocess
 import sys
-from typing import Callable
+from collections.abc import Callable
 
 TOOLS_DIR = os.path.dirname(__file__)
 ROOT_DIR = os.path.dirname(TOOLS_DIR)

tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py

@@ -1,7 +1,7 @@
 import json
 import os
 import re
-from typing import Callable, Iterator
+from collections.abc import Callable, Iterator
 from urllib.parse import urlsplit
 
 import scrapy

tools/lib/capitalization.py

@@ -1,5 +1,5 @@
 import re
-from typing import Match
+from re import Match
 
 from bs4 import BeautifulSoup
 

tools/lib/template_parser.py

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 
 from typing_extensions import override
 

tools/lib/test_script.py

@@ -3,7 +3,7 @@
 import subprocess
 import sys
 from argparse import ArgumentParser
-from typing import Iterable
+from collections.abc import Iterable
 
 from scripts.lib.zulip_tools import get_dev_uuid_var_path
 from version import PROVISION_VERSION

tools/lib/test_server.py

@@ -2,8 +2,8 @@
 import subprocess
 import sys
 import time
+from collections.abc import Iterator
 from contextlib import ExitStack, contextmanager
-from typing import Iterator
 
 # Verify the Zulip venv is available.
 from tools.lib import sanity_check

tools/semgrep-py.yml

@@ -279,10 +279,10 @@ rules:
           def $F(..., invalid_param: typing.Optional[<...  zerver.lib.typed_endpoint.ApiParamConfig(...) ...>], ...) -> ...:
             ...
       - pattern-not: |
-          def $F(..., $A: typing_extensions.Annotated[<...  zerver.lib.typed_endpoint.ApiParamConfig(...) ...>], ...) -> ...:
+          def $F(..., $A: typing.Annotated[<...  zerver.lib.typed_endpoint.ApiParamConfig(...) ...>], ...) -> ...:
             ...
       - pattern-not: |
-          def $F(..., $A: typing_extensions.Annotated[<...  zerver.lib.typed_endpoint.ApiParamConfig(...) ...>] = ..., ...) -> ...:
+          def $F(..., $A: typing.Annotated[<...  zerver.lib.typed_endpoint.ApiParamConfig(...) ...>] = ..., ...) -> ...:
             ...
       - pattern-either:
           - pattern: |

tools/setup/emoji/build_emoji

@@ -5,7 +5,8 @@
 import os
 import shutil
 import sys
-from typing import Any, Iterator, Sequence
+from collections.abc import Iterator, Sequence
+from typing import Any
 
 import orjson
 

tools/tail-ses

@@ -12,8 +12,9 @@ setup_path()
 os.environ["DJANGO_SETTINGS_MODULE"] = "zproject.settings"
 import argparse
 import secrets
+from collections.abc import Iterator
 from contextlib import contextmanager
-from typing import Iterator, TypedDict
+from typing import TypedDict
 
 import boto3.session
 import orjson

tools/test-backend

@@ -8,7 +8,8 @@ import shlex
 import subprocess
 import sys
 import tempfile
-from typing import TYPE_CHECKING, Iterator, cast
+from collections.abc import Iterator
+from typing import TYPE_CHECKING, cast
 from unittest import mock
 
 if TYPE_CHECKING:

tools/test-documentation

@@ -3,7 +3,7 @@ import argparse
 import os
 import subprocess
 import sys
-from typing import Sequence
+from collections.abc import Sequence
 
 ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 os.chdir(ZULIP_PATH)

tools/test-help-documentation

@@ -4,7 +4,7 @@ import contextlib
 import os
 import subprocess
 import sys
-from typing import Iterator
+from collections.abc import Iterator
 
 ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 os.chdir(ZULIP_PATH)