cq: Use union operator

This commit is contained in:
wurstsalat
2023-06-11 12:39:01 +02:00
parent 298406cc22
commit 77c9c8818f
5 changed files with 12 additions and 20 deletions

View File

@@ -16,7 +16,6 @@
from __future__ import annotations
from typing import Any
from typing import Optional
from collections import UserDict
from dataclasses import dataclass
@@ -26,8 +25,8 @@ from gajim.plugins.plugins_i18n import _
@dataclass
class ClientData:
default: Optional[tuple[str, str]] = None
variations: Optional[dict[str, str]] = None
default: tuple[str, str] | None = None
variations: dict[str, str] | None = None
def get_variations(client_name: str) -> list[str]:

View File

@@ -16,8 +16,6 @@
from __future__ import annotations
from typing import cast
from typing import Optional
from typing import Union
import logging
from pathlib import Path
@@ -64,17 +62,17 @@ class ClientsIconsPlugin(GajimPlugin):
_icon_theme.append_search_path(str(Path(__file__).parent))
@staticmethod
def _get_client_identity_name(disco_info: DiscoInfo) -> Optional[str]:
def _get_client_identity_name(disco_info: DiscoInfo) -> str | None:
for identity in disco_info.identities:
if identity.category == 'client':
return identity.name
return None
def _get_image_and_client_name(self,
contact: Union[
GroupchatParticipant, ResourceContact],
contact:
GroupchatParticipant | ResourceContact,
_widget: Gtk.Widget
) -> Optional[tuple[Gtk.Image, str]]:
) -> tuple[Gtk.Image, str] | None:
disco_info = app.storage.cache.get_last_disco_info(contact.jid)
if disco_info is None: