From fa9402e8603729a30d90c3b622d80c3be3edf361 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Thu, 21 Jul 2022 06:23:05 +0000
Subject: [PATCH] Revert "fix: python 3.10 compatibility"
This reverts commit 5093eb906f960242abc81791f495af5e6dacde65
---
funkwhale_cli/utils.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/funkwhale_cli/utils.py b/funkwhale_cli/utils.py
index a5d195e..9fda4d3 100644
--- a/funkwhale_cli/utils.py
+++ b/funkwhale_cli/utils.py
@@ -1,13 +1,9 @@
+import collections
import json
import urllib.parse
import pathvalidate
-try:
- from collections.abc import MutableMapping
-except ImportError:
- # python<3.10 compatibility
- from collections import MutableMapping
def recursive_getattr(obj, key, permissive=False):
"""
@@ -96,7 +92,7 @@ def flatten(d, parent_key="", sep="_"):
items = []
for k, v in d.items():
new_key = parent_key + sep + k if parent_key else k
- if isinstance(v, MutableMapping):
+ if isinstance(v, collections.MutableMapping):
items.extend(flatten(v, new_key, sep=sep).items())
else:
items.append((new_key, v))
--
GitLab