Fix Python 3.10 Collections package import error (#271)

* Fix Python 3.10 Collections package import error

* Fix Iterable,Mapping import

* Fix python 3.10 import error

* Fix python3.10 import

Author: mi-alkhamis

maas/client/bones/__init__.py

@@ -7,7 +7,9 @@
 __all__ = ["CallError", "SessionAPI"]
 
 import typing
-from collections import Iterable, namedtuple
+
+from collections import namedtuple
+from collections.abc import Iterable
 import json
 from urllib.parse import urlparse
 

maas/client/utils/__init__.py

@@ -26,7 +26,9 @@
     "vars_class",
 ]
 
-from collections import Iterable, namedtuple
+
+from collections import namedtuple
+from collections.abc import Iterable
 from functools import lru_cache, partial
 from inspect import cleandoc, getdoc
 from itertools import chain, cycle, repeat
@@ -175,7 +177,7 @@ def sign(uri, headers, credentials):
 docstring = namedtuple("docstring", ("title", "body"))
 
 
-@lru_cache(2 ** 10)
+@lru_cache(2**10)
 def parse_docstring(thing):
     """Parse a Python docstring, or the docstring found on `thing`.
 

maas/client/utils/multipart.py

@@ -16,7 +16,7 @@
 
 __all__ = ["encode_multipart_data"]
 
-from collections import Iterable, Mapping
+from collections.abc import Iterable, Mapping
 from email.generator import BytesGenerator
 from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart

maas/client/viscera/__init__.py

@@ -19,7 +19,8 @@
     "OriginBase",
 ]
 
-from collections import defaultdict, Iterable, Mapping, Sequence
+from collections.abc import Iterable, Mapping, Sequence
+from collections import defaultdict
 from copy import copy
 from datetime import datetime
 from functools import wraps

maas/client/viscera/boot_source_selections.py

@@ -2,8 +2,8 @@
 
 __all__ = ["BootSourceSelection", "BootSourceSelections"]
 
-from collections import Sequence
 
+from collections.abc import Sequence
 from . import check, Object, ObjectField, ObjectFieldRelated, ObjectSet, ObjectType
 from .boot_sources import BootSource
 

maas/client/viscera/nodes.py

@@ -2,7 +2,13 @@
 
 __all__ = ["Node", "Nodes"]
 
-from collections import Sequence
+try:
+    # Python <= 3.9
+    from collections import Sequence
+except:
+    # Python > 3.9
+    from collections.abc import Sequence
+
 import typing
 
 from . import (

maas/client/viscera/testing/__init__.py

@@ -2,7 +2,8 @@
 
 __all__ = ["bind"]
 
-from collections import Mapping
+
+from collections.abc import Mapping
 from itertools import chain
 from unittest.mock import Mock