sync changes with master

dist/ba_data/python/bacommon/net.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Any, Annotated
+from typing import TYPE_CHECKING, Any, Annotated
 from dataclasses import dataclass, field
 
 from efro.dataclassio import ioprepped, IOAttrs
@@ -28,7 +28,7 @@ class ServerNodeQueryResponse:
     """A response to a query about server-nodes."""
 
     # If present, something went wrong, and this describes it.
-    error: Annotated[Optional[str], IOAttrs('e', store_default=False)] = None
+    error: Annotated[str | None, IOAttrs('e', store_default=False)] = None
 
     # The set of servernodes.
     servers: Annotated[list[ServerNodeEntry],
@@ -40,11 +40,11 @@ class ServerNodeQueryResponse:
 @dataclass
 class PrivateHostingState:
     """Combined state of whether we're hosting, whether we can, etc."""
-    unavailable_error: Optional[str] = None
-    party_code: Optional[str] = None
+    unavailable_error: str | None = None
+    party_code: str | None = None
     tickets_to_host_now: int = 0
-    minutes_until_free_host: Optional[float] = None
-    free_host_minutes_remaining: Optional[float] = None
+    minutes_until_free_host: float | None = None
+    free_host_minutes_remaining: float | None = None
 
 
 @ioprepped
@@ -55,10 +55,10 @@ class PrivateHostingConfig:
     playlist_name: str = 'Unknown'
     randomize: bool = False
     tutorial: bool = False
-    custom_team_names: Optional[tuple[str, str]] = None
-    custom_team_colors: Optional[tuple[tuple[float, float, float],
-                                       tuple[float, float, float]]] = None
-    playlist: Optional[list[dict[str, Any]]] = None
+    custom_team_names: tuple[str, str] | None = None
+    custom_team_colors: tuple[tuple[float, float, float],
+                              tuple[float, float, float]] | None = None
+    playlist: list[dict[str, Any]] | None = None
     exit_minutes: float = 120.0
     exit_minutes_unclean: float = 180.0
     exit_minutes_idle: float = 10.0
@@ -68,7 +68,7 @@ class PrivateHostingConfig:
 @dataclass
 class PrivatePartyConnectResult:
     """Info about a server we get back when connecting."""
-    error: Optional[str] = None
-    addr: Optional[str] = None
-    port: Optional[int] = None
-    password: Optional[str] = None
+    error: str | None = None
+    addr: str | None = None
+    port: int | None = None
+    password: str | None = None