Use new syntax for isinstance of union (#2036)

funnel/loginproviders/github.py

@@ -84,7 +84,7 @@ def callback(self) -> LoginProviderData:
 
         email = None
         emails = []
-        if ghemails and isinstance(ghemails, (list, tuple)):
+        if ghemails and isinstance(ghemails, list | tuple):
             for result in ghemails:
                 if result.get('verified') and not result['email'].endswith(
                     '@users.noreply.github.com'

funnel/models/shortlink.py

@@ -177,7 +177,7 @@ class ShortLinkToBigIntComparator(Comparator):  # pylint: disable=abstract-metho
 
     def __eq__(self, other: Any) -> sa.ColumnElement[bool]:  # type: ignore[override]
         """Return an expression for column == other."""
-        if isinstance(other, (str, bytes)):
+        if isinstance(other, str | bytes):
             return self.__clause_element__() == name_to_bigint(
                 other
             )  # type: ignore[return-value]

funnel/models/utils.py

@@ -290,7 +290,7 @@ def do_migrate_table(table: sa.Table) -> bool:
                         old_instance, new_instance
                     )
                     session.flush()
-                    if isinstance(result, (list, tuple, set)):
+                    if isinstance(result, list | tuple | set):
                         migrated_tables.update(result)
                     migrated_tables.add(model.__table__.name)
                 except IncompleteUserMigrationError:

funnel/transports/sms/send.py

@@ -163,7 +163,7 @@ def send_via_exotel(
         if r.status_code in (200, 201):
             # All good
             jsonresponse = r.json()
-            if isinstance(jsonresponse, (list, tuple)) and jsonresponse:
+            if isinstance(jsonresponse, list | tuple) and jsonresponse:
                 transactionid = jsonresponse[0].get('SMSMessage', {}).get('Sid')
             elif isinstance(jsonresponse, dict):
                 transactionid = jsonresponse.get('SMSMessage', {}).get('Sid')

funnel/utils/jinja_template.py

@@ -126,7 +126,7 @@ def visit_Include(self, node: nodes.Include, frame: Frame) -> None:  # noqa: N80
         super().visit_Include(node, frame)
         template: str | list[str] | None = None
         include_template: Any = node.template
-        if isinstance(include_template, (nodes.Tuple, nodes.List)):
+        if isinstance(include_template, nodes.Tuple | nodes.List):
             try:
                 include_template = include_template.as_const(frame.eval_ctx)
             except nodes.Impossible:
@@ -138,7 +138,7 @@ def visit_Include(self, node: nodes.Include, frame: Frame) -> None:  # noqa: N80
             include_template = include_template.value
         if isinstance(include_template, str):
             template = include_template
-        elif isinstance(include_template, (tuple, list)):
+        elif isinstance(include_template, tuple | list):
             template = list(include_template)
         else:
             warnings.warn(

funnel/views/otp.py

@@ -150,9 +150,9 @@ def make(
         # to this cache entry in the user's cookie session. The cookie never contains
         # the actual OTP. See :func:`make_cached_token` for additional documentation.
         otp = newpin()
-        if isinstance(anchor, (AccountPhone, PhoneNumber)):
+        if isinstance(anchor, AccountPhone | PhoneNumber):
             phone = str(anchor)
-        if isinstance(anchor, (AccountEmail, AccountEmailClaim, EmailAddress)):
+        if isinstance(anchor, AccountEmail | AccountEmailClaim | EmailAddress):
             email = str(anchor)
         token = make_cached_token(
             {