From d96a907eab8a8ba6aad288e7b2b0265fbcc50ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Tue, 11 Jun 2024 03:24:27 +0000 Subject: [PATCH] Remove six.moves: collections_abc --- jellyfin_kodi/jellyfin/utils.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jellyfin_kodi/jellyfin/utils.py b/jellyfin_kodi/jellyfin/utils.py index af5cab59..05944e56 100644 --- a/jellyfin_kodi/jellyfin/utils.py +++ b/jellyfin_kodi/jellyfin/utils.py @@ -1,14 +1,14 @@ from collections import namedtuple +from collections.abc import Iterable, Mapping, MutableMapping from six import string_types -from six.moves import collections_abc def clean_none_dict_values(obj): """ Recursively remove keys with a value of None """ - if not isinstance(obj, collections_abc.Iterable) or isinstance(obj, string_types): + if not isinstance(obj, Iterable) or isinstance(obj, string_types): return obj queue = [obj] @@ -16,8 +16,8 @@ def clean_none_dict_values(obj): while queue: item = queue.pop() - if isinstance(item, collections_abc.Mapping): - mutable = isinstance(item, collections_abc.MutableMapping) + if isinstance(item, Mapping): + mutable = isinstance(item, MutableMapping) remove = [] for key, value in item.items(): @@ -27,7 +27,7 @@ def clean_none_dict_values(obj): elif isinstance(value, string_types): continue - elif isinstance(value, collections_abc.Iterable): + elif isinstance(value, Iterable): queue.append(value) if mutable: @@ -35,11 +35,11 @@ def clean_none_dict_values(obj): for key in remove: item.pop(key) - elif isinstance(item, collections_abc.Iterable): + elif isinstance(item, Iterable): for value in item: if value is None or isinstance(value, string_types): continue - elif isinstance(value, collections_abc.Iterable): + elif isinstance(value, Iterable): queue.append(value) return obj