From 6e9eab1107ccf10356d4557441e846ac30af0fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sun, 28 May 2023 21:21:11 +0200 Subject: cq: Import from collections.abc instead from typing --- gajim/common/commands.py | 2 +- gajim/common/configpaths.py | 2 +- gajim/common/dbus/system_style.py | 2 +- gajim/common/events.py | 2 +- gajim/common/file_props.py | 3 ++- gajim/common/ged.py | 2 +- gajim/common/helpers.py | 2 +- gajim/common/jingle_content.py | 3 ++- gajim/common/jingle_rtp.py | 4 ++-- gajim/common/jingle_session.py | 2 +- gajim/common/logging_helpers.py | 3 +-- gajim/common/modules/blocking.py | 2 +- gajim/common/modules/caps.py | 2 +- gajim/common/modules/contacts.py | 2 +- gajim/common/modules/delimiter.py | 2 +- gajim/common/modules/httpupload.py | 2 +- gajim/common/modules/omemo.py | 2 +- gajim/common/modules/ping.py | 3 +-- gajim/common/modules/pubsub.py | 3 ++- gajim/common/modules/roster.py | 5 +++-- gajim/common/modules/security_labels.py | 2 +- gajim/common/modules/user_avatar.py | 2 +- gajim/common/modules/vcard_avatars.py | 4 ++-- gajim/common/preview.py | 2 +- gajim/common/settings.py | 2 +- gajim/common/storage/archive.py | 4 ++-- gajim/common/storage/base.py | 2 +- gajim/common/styling.py | 2 +- gajim/common/types.py | 2 +- gajim/common/winapi/system_style.py | 2 +- gajim/gtk/application.py | 2 +- gajim/gtk/apply_button_box.py | 3 ++- gajim/gtk/assistant.py | 3 ++- gajim/gtk/const.py | 4 ++-- gajim/gtk/conversation/rows/widgets.py | 2 +- gajim/gtk/conversation/view.py | 2 +- gajim/gtk/dataform.py | 3 ++- gajim/gtk/filechoosers.py | 2 +- gajim/gtk/menus.py | 4 ++-- gajim/gtk/notification_manager.py | 3 ++- gajim/gtk/preview_audio_analyzer.py | 2 +- gajim/gtk/search_view.py | 2 +- gajim/gtk/settings.py | 2 +- gajim/gtk/structs.py | 2 +- gajim/plugins/gajimplugin.py | 2 +- gajim/plugins/pluginmanager.py | 2 +- gajim/plugins/repository.py | 2 +- pyproject.toml | 1 - 48 files changed, 61 insertions(+), 56 deletions(-) diff --git a/gajim/common/commands.py b/gajim/common/commands.py index e8a3ae0c0..2603958fc 100644 --- a/gajim/common/commands.py +++ b/gajim/common/commands.py @@ -13,13 +13,13 @@ # along with Gajim. If not, see . from typing import Any -from typing import Callable from typing import NoReturn import argparse import io import operator import shlex +from collections.abc import Callable from nbxmpp.protocol import JID diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py index 0de32dc65..b46bdfb55 100644 --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -22,12 +22,12 @@ from __future__ import annotations from typing import cast -from typing import Generator import importlib.resources import os import sys import tempfile +from collections.abc import Generator from pathlib import Path from gi.repository import GLib diff --git a/gajim/common/dbus/system_style.py b/gajim/common/dbus/system_style.py index 8a8995f0c..7dac212da 100644 --- a/gajim/common/dbus/system_style.py +++ b/gajim/common/dbus/system_style.py @@ -15,10 +15,10 @@ from __future__ import annotations from typing import Any -from typing import Callable import logging import sys +from collections.abc import Callable from gi.repository import Gio from gi.repository import GLib diff --git a/gajim/common/events.py b/gajim/common/events.py index bce0e5018..c9954db12 100644 --- a/gajim/common/events.py +++ b/gajim/common/events.py @@ -16,9 +16,9 @@ from __future__ import annotations import typing from typing import Any -from typing import Callable from typing import Union +from collections.abc import Callable from dataclasses import dataclass from dataclasses import field diff --git a/gajim/common/file_props.py b/gajim/common/file_props.py index 2c26c0b31..fc477dabf 100644 --- a/gajim/common/file_props.py +++ b/gajim/common/file_props.py @@ -19,10 +19,11 @@ True from __future__ import annotations -from typing import Callable from typing import ClassVar from typing import Literal +from collections.abc import Callable + class FilesProp: _files_props: ClassVar[dict[tuple[str, str], FileProp]] = {} diff --git a/gajim/common/ged.py b/gajim/common/ged.py index 238d00dcc..ad136f913 100644 --- a/gajim/common/ged.py +++ b/gajim/common/ged.py @@ -15,12 +15,12 @@ from __future__ import annotations from typing import Any -from typing import Callable import inspect import logging import operator import traceback +from collections.abc import Callable from nbxmpp import NodeProcessed diff --git a/gajim/common/helpers.py b/gajim/common/helpers.py index f448e05d4..3f791d29d 100644 --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -28,7 +28,6 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import TYPE_CHECKING import collections @@ -50,6 +49,7 @@ import unicodedata import weakref import webbrowser from collections import defaultdict +from collections.abc import Callable from datetime import datetime from datetime import timedelta from functools import wraps diff --git a/gajim/common/jingle_content.py b/gajim/common/jingle_content.py index e9e155832..78fd41188 100644 --- a/gajim/common/jingle_content.py +++ b/gajim/common/jingle_content.py @@ -19,9 +19,10 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import TYPE_CHECKING +from collections.abc import Callable + import nbxmpp from nbxmpp.namespaces import Namespace diff --git a/gajim/common/jingle_rtp.py b/gajim/common/jingle_rtp.py index ebcda169d..8f1fc5959 100644 --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -19,12 +19,12 @@ from __future__ import annotations from typing import Any -from typing import Callable -from typing import Iterator import logging import socket from collections import deque +from collections.abc import Callable +from collections.abc import Iterator from datetime import datetime import nbxmpp diff --git a/gajim/common/jingle_session.py b/gajim/common/jingle_session.py index 263e07bb5..75d66ff97 100644 --- a/gajim/common/jingle_session.py +++ b/gajim/common/jingle_session.py @@ -29,11 +29,11 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import TYPE_CHECKING import logging import time +from collections.abc import Callable from enum import Enum from enum import unique diff --git a/gajim/common/logging_helpers.py b/gajim/common/logging_helpers.py index 3cc5e9d7e..19b1fdfd3 100644 --- a/gajim/common/logging_helpers.py +++ b/gajim/common/logging_helpers.py @@ -14,12 +14,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see . -from typing import Callable - import logging import os import sys import time +from collections.abc import Callable from datetime import datetime from gajim.common import app diff --git a/gajim/common/modules/blocking.py b/gajim/common/modules/blocking.py index 00e4c0d50..1b3809897 100644 --- a/gajim/common/modules/blocking.py +++ b/gajim/common/modules/blocking.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Generator +from collections.abc import Generator import nbxmpp from nbxmpp.modules.util import raise_if_error diff --git a/gajim/common/modules/caps.py b/gajim/common/modules/caps.py index 48271a084..4c5fd758f 100644 --- a/gajim/common/modules/caps.py +++ b/gajim/common/modules/caps.py @@ -20,10 +20,10 @@ from __future__ import annotations from typing import Any -from typing import Callable import weakref from collections import defaultdict +from collections.abc import Callable from nbxmpp.errors import StanzaError from nbxmpp.namespaces import Namespace diff --git a/gajim/common/modules/contacts.py b/gajim/common/modules/contacts.py index 0bd16ff40..0aa0c8cf1 100644 --- a/gajim/common/modules/contacts.py +++ b/gajim/common/modules/contacts.py @@ -15,9 +15,9 @@ from __future__ import annotations from typing import Any -from typing import Iterator from typing import overload +from collections.abc import Iterator from datetime import datetime from datetime import timezone diff --git a/gajim/common/modules/delimiter.py b/gajim/common/modules/delimiter.py index e4aaa092e..2bc95b4c4 100644 --- a/gajim/common/modules/delimiter.py +++ b/gajim/common/modules/delimiter.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Generator +from collections.abc import Generator from nbxmpp.errors import is_error diff --git a/gajim/common/modules/httpupload.py b/gajim/common/modules/httpupload.py index aecd89495..46373391d 100644 --- a/gajim/common/modules/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -16,13 +16,13 @@ from __future__ import annotations -from typing import Callable from typing import cast import mimetypes import os import tempfile from collections import defaultdict +from collections.abc import Callable from pathlib import Path from urllib.parse import urlparse diff --git a/gajim/common/modules/omemo.py b/gajim/common/modules/omemo.py index 08f67c852..3885c214d 100644 --- a/gajim/common/modules/omemo.py +++ b/gajim/common/modules/omemo.py @@ -19,10 +19,10 @@ from __future__ import annotations from typing import Any -from typing import Callable import binascii import threading +from collections.abc import Callable from pathlib import Path from gi.repository import GLib diff --git a/gajim/common/modules/ping.py b/gajim/common/modules/ping.py index 5ece70016..52211bba7 100644 --- a/gajim/common/modules/ping.py +++ b/gajim/common/modules/ping.py @@ -16,9 +16,8 @@ from __future__ import annotations -from typing import Generator - import time +from collections.abc import Generator from nbxmpp.errors import is_error from nbxmpp.structs import CommonResult diff --git a/gajim/common/modules/pubsub.py b/gajim/common/modules/pubsub.py index 3fc980881..c961a44f3 100644 --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -23,7 +23,8 @@ from __future__ import annotations from typing import Any -from typing import Callable + +from collections.abc import Callable import nbxmpp from nbxmpp.namespaces import Namespace diff --git a/gajim/common/modules/roster.py b/gajim/common/modules/roster.py index 775dbf82f..e918bf756 100644 --- a/gajim/common/modules/roster.py +++ b/gajim/common/modules/roster.py @@ -17,8 +17,9 @@ from __future__ import annotations from typing import cast -from typing import Iterable -from typing import Iterator + +from collections.abc import Iterable +from collections.abc import Iterator import nbxmpp from nbxmpp.namespaces import Namespace diff --git a/gajim/common/modules/security_labels.py b/gajim/common/modules/security_labels.py index 8895925fb..cc9ff9b5b 100644 --- a/gajim/common/modules/security_labels.py +++ b/gajim/common/modules/security_labels.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Generator +from collections.abc import Generator from nbxmpp.errors import is_error from nbxmpp.modules.security_labels import Catalog diff --git a/gajim/common/modules/user_avatar.py b/gajim/common/modules/user_avatar.py index 7a680bf0a..953b6a62a 100644 --- a/gajim/common/modules/user_avatar.py +++ b/gajim/common/modules/user_avatar.py @@ -16,7 +16,7 @@ from __future__ import annotations -from typing import Generator +from collections.abc import Generator from nbxmpp.modules.user_avatar import AvatarData from nbxmpp.modules.util import is_error diff --git a/gajim/common/modules/vcard_avatars.py b/gajim/common/modules/vcard_avatars.py index 756caa4b9..7a8f66a11 100644 --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -17,10 +17,10 @@ from __future__ import annotations from typing import Any -from typing import Callable -from typing import Generator import weakref +from collections.abc import Callable +from collections.abc import Generator from nbxmpp.const import AvatarState from nbxmpp.modules.util import is_error diff --git a/gajim/common/preview.py b/gajim/common/preview.py index 2f1e72437..6d73ab2fe 100644 --- a/gajim/common/preview.py +++ b/gajim/common/preview.py @@ -15,13 +15,13 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast import logging import os import re import uuid +from collections.abc import Callable from dataclasses import dataclass from dataclasses import field from pathlib import Path diff --git a/gajim/common/settings.py b/gajim/common/settings.py index f423ee958..129193800 100644 --- a/gajim/common/settings.py +++ b/gajim/common/settings.py @@ -13,7 +13,6 @@ # along with Gajim. If not, see . from typing import Any -from typing import Callable from typing import cast from typing import Literal from typing import NamedTuple @@ -29,6 +28,7 @@ import uuid import weakref from collections import defaultdict from collections import namedtuple +from collections.abc import Callable from pathlib import Path from gi.repository import GLib diff --git a/gajim/common/storage/archive.py b/gajim/common/storage/archive.py index 36a9907c8..3ce90d309 100644 --- a/gajim/common/storage/archive.py +++ b/gajim/common/storage/archive.py @@ -22,8 +22,6 @@ # along with Gajim. If not, see . from typing import Any -from typing import Iterator -from typing import KeysView from typing import Literal from typing import NamedTuple @@ -34,6 +32,8 @@ import logging import sqlite3 as sqlite import time from collections import namedtuple +from collections.abc import Iterator +from collections.abc import KeysView from nbxmpp import JID from nbxmpp.structs import CommonError diff --git a/gajim/common/storage/base.py b/gajim/common/storage/base.py index 87e45555a..9b60bb1ba 100644 --- a/gajim/common/storage/base.py +++ b/gajim/common/storage/base.py @@ -15,7 +15,6 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast from typing import TypeVar @@ -25,6 +24,7 @@ import math import sqlite3 import sys import time +from collections.abc import Callable from pathlib import Path import nbxmpp.const diff --git a/gajim/common/styling.py b/gajim/common/styling.py index bfe828caf..6fc7e048d 100644 --- a/gajim/common/styling.py +++ b/gajim/common/styling.py @@ -15,12 +15,12 @@ from __future__ import annotations from typing import Any -from typing import Match import re import string from dataclasses import dataclass from dataclasses import field +from re import Match from gi.repository import GLib diff --git a/gajim/common/types.py b/gajim/common/types.py index 523c950d4..45998eebf 100644 --- a/gajim/common/types.py +++ b/gajim/common/types.py @@ -15,11 +15,11 @@ # Types for typechecking from typing import Any -from typing import Callable from typing import TYPE_CHECKING from typing import Union import weakref +from collections.abc import Callable import nbxmpp from gi.repository import GdkPixbuf diff --git a/gajim/common/winapi/system_style.py b/gajim/common/winapi/system_style.py index fe986c8eb..05a2e4a44 100644 --- a/gajim/common/winapi/system_style.py +++ b/gajim/common/winapi/system_style.py @@ -17,9 +17,9 @@ from __future__ import annotations from typing import Any -from typing import Callable import logging +from collections.abc import Callable from winsdk.windows.ui import Color from winsdk.windows.ui.viewmanagement import UIColorType diff --git a/gajim/gtk/application.py b/gajim/gtk/application.py index 43779da1b..e09b3fadc 100644 --- a/gajim/gtk/application.py +++ b/gajim/gtk/application.py @@ -36,11 +36,11 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast import os import sys +from collections.abc import Callable from datetime import datetime from datetime import timedelta from datetime import timezone diff --git a/gajim/gtk/apply_button_box.py b/gajim/gtk/apply_button_box.py index e54bc21aa..0c87a2162 100644 --- a/gajim/gtk/apply_button_box.py +++ b/gajim/gtk/apply_button_box.py @@ -15,7 +15,8 @@ from __future__ import annotations from typing import Any -from typing import Callable + +from collections.abc import Callable from gi.repository import Gtk diff --git a/gajim/gtk/assistant.py b/gajim/gtk/assistant.py index c756fbdf4..6d7ddcaaf 100644 --- a/gajim/gtk/assistant.py +++ b/gajim/gtk/assistant.py @@ -15,11 +15,12 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast from typing import Literal from typing import overload +from collections.abc import Callable + from gi.repository import Gdk from gi.repository import GObject from gi.repository import Gtk diff --git a/gajim/gtk/const.py b/gajim/gtk/const.py index d9be59561..107a910df 100644 --- a/gajim/gtk/const.py +++ b/gajim/gtk/const.py @@ -17,10 +17,10 @@ from __future__ import annotations from typing import Any -from typing import Callable -from typing import Iterator from typing import NamedTuple +from collections.abc import Callable +from collections.abc import Iterator from enum import Enum from enum import IntEnum from enum import unique diff --git a/gajim/gtk/conversation/rows/widgets.py b/gajim/gtk/conversation/rows/widgets.py index ad48534aa..99f556998 100644 --- a/gajim/gtk/conversation/rows/widgets.py +++ b/gajim/gtk/conversation/rows/widgets.py @@ -15,8 +15,8 @@ from __future__ import annotations from typing import Any -from typing import Callable +from collections.abc import Callable from datetime import datetime import cairo diff --git a/gajim/gtk/conversation/view.py b/gajim/gtk/conversation/view.py index 6662a5a73..63b1f3ea1 100644 --- a/gajim/gtk/conversation/view.py +++ b/gajim/gtk/conversation/view.py @@ -16,11 +16,11 @@ from __future__ import annotations from typing import Any from typing import cast -from typing import Generator from typing import Literal import logging import time +from collections.abc import Generator from datetime import datetime from datetime import timedelta diff --git a/gajim/gtk/dataform.py b/gajim/gtk/dataform.py index f5b950ed0..8788e935c 100644 --- a/gajim/gtk/dataform.py +++ b/gajim/gtk/dataform.py @@ -15,9 +15,10 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast +from collections.abc import Callable + from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk diff --git a/gajim/gtk/filechoosers.py b/gajim/gtk/filechoosers.py index b3e914c6f..0af37850f 100644 --- a/gajim/gtk/filechoosers.py +++ b/gajim/gtk/filechoosers.py @@ -18,11 +18,11 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast import os import sys +from collections.abc import Callable from pathlib import Path from gi.repository import GdkPixbuf diff --git a/gajim/gtk/menus.py b/gajim/gtk/menus.py index b2c6e9da7..419d3aa1c 100644 --- a/gajim/gtk/menus.py +++ b/gajim/gtk/menus.py @@ -17,11 +17,11 @@ from __future__ import annotations -from typing import Callable from typing import cast -from typing import Iterator import textwrap +from collections.abc import Callable +from collections.abc import Iterator from datetime import datetime from urllib.parse import quote diff --git a/gajim/gtk/notification_manager.py b/gajim/gtk/notification_manager.py index d8517a85e..95dc7d04e 100644 --- a/gajim/gtk/notification_manager.py +++ b/gajim/gtk/notification_manager.py @@ -15,9 +15,10 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast +from collections.abc import Callable + from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk diff --git a/gajim/gtk/preview_audio_analyzer.py b/gajim/gtk/preview_audio_analyzer.py index f8c4c028b..a942ffdea 100644 --- a/gajim/gtk/preview_audio_analyzer.py +++ b/gajim/gtk/preview_audio_analyzer.py @@ -14,11 +14,11 @@ from __future__ import annotations -from typing import Callable from typing import cast import logging import math +from collections.abc import Callable from pathlib import Path try: diff --git a/gajim/gtk/search_view.py b/gajim/gtk/search_view.py index 387b5592e..b2c55356b 100644 --- a/gajim/gtk/search_view.py +++ b/gajim/gtk/search_view.py @@ -15,12 +15,12 @@ from __future__ import annotations from typing import Any -from typing import Iterator import itertools import logging import re import time +from collections.abc import Iterator from datetime import datetime from datetime import timedelta diff --git a/gajim/gtk/settings.py b/gajim/gtk/settings.py index 94d48ee95..715c8db1c 100644 --- a/gajim/gtk/settings.py +++ b/gajim/gtk/settings.py @@ -17,10 +17,10 @@ from __future__ import annotations from typing import Any -from typing import Callable from typing import cast import logging +from collections.abc import Callable from gi.repository import Gdk from gi.repository import GLib diff --git a/gajim/gtk/structs.py b/gajim/gtk/structs.py index cf88dbe7a..91f3aad56 100644 --- a/gajim/gtk/structs.py +++ b/gajim/gtk/structs.py @@ -15,11 +15,11 @@ from __future__ import annotations from typing import Any -from typing import Callable import functools import inspect import sys +from collections.abc import Callable from dataclasses import dataclass from gi.repository import Gio diff --git a/gajim/plugins/gajimplugin.py b/gajim/plugins/gajimplugin.py index 40c05a80f..a55ddd775 100644 --- a/gajim/plugins/gajimplugin.py +++ b/gajim/plugins/gajimplugin.py @@ -15,11 +15,11 @@ from __future__ import annotations from typing import Any -from typing import Generator import logging import os import pickle +from collections.abc import Generator from gajim.common import configpaths from gajim.common.events import ApplicationEvent diff --git a/gajim/plugins/pluginmanager.py b/gajim/plugins/pluginmanager.py index b1f660456..135155f83 100644 --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -15,12 +15,12 @@ from __future__ import annotations from typing import Any -from typing import Callable import logging import os import sys import zipfile +from collections.abc import Callable from importlib.util import module_from_spec from importlib.util import spec_from_file_location from pathlib import Path diff --git a/gajim/plugins/repository.py b/gajim/plugins/repository.py index f0cd0a74d..3a9216486 100644 --- a/gajim/plugins/repository.py +++ b/gajim/plugins/repository.py @@ -14,10 +14,10 @@ from typing import Any from typing import cast -from typing import Iterable import json import logging +from collections.abc import Iterable from io import BytesIO from zipfile import ZipFile diff --git a/pyproject.toml b/pyproject.toml index 806e05384..5196ff53a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -234,7 +234,6 @@ ignore = [ "SIM212", # Use `value if value else ''` instead of `'' if not value else value` "SIM300", # Yoda conditions are discouraged use x instead "UP032", # Use f-string instead of `format` call - "UP035", # Import from `collections.abc` instead: `Callable` "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)` "UP037", # Remove quotes from type annotation ] -- cgit v1.2.3