Merge pull request #288 from ipfilip/main

Fix python 3.10 errors (deprecated collections)

Author: tkrebes

nixnet/_session/collection.py

@@ -3,7 +3,10 @@
 from __future__ import print_function
 
 import abc
-import collections
+try:
+    from collections.abc import Sequence  # python 3.3+
+except ImportError:
+    from collections import Sequence  # python 2.7
 import typing  # NOQA: F401
 
 import six
@@ -12,7 +15,7 @@
 
 
 @six.add_metaclass(abc.ABCMeta)
-class Collection(collections.Sequence):
+class Collection(Sequence):
     """Collection of items in a session."""
 
     def __init__(self, handle):

nixnet/_utils.py

@@ -2,7 +2,10 @@
 from __future__ import division
 from __future__ import print_function
 
-import collections
+try:
+    from collections.abc import Iterable # python 3.3+
+except ImportError:
+    from collections import Iterable  # python 2.7
 import typing  # NOQA: F401
 
 import six
@@ -30,7 +33,7 @@ def flatten_items(list):
         if ',' in list:
             _errors.raise_xnet_error(_cconsts.NX_ERR_INVALID_PROPERTY_VALUE)
         flattened = list
-    elif isinstance(list, collections.Iterable):
+    elif isinstance(list, Iterable):
         flattened = ",".join(list)
     elif list is None:
         # For FRAME_IN_STREAM / FRAME_OUT_STREAM

nixnet/database/_collection.py

@@ -2,7 +2,10 @@
 from __future__ import division
 from __future__ import print_function
 
-import collections
+try:
+    from collections.abc import Mapping  # python 3.3+
+except ImportError:
+    from collections import Mapping  # python 2.7
 import typing  # NOQA: F401
 
 import six
@@ -14,7 +17,7 @@
 from nixnet.database import _database_object  # NOQA: F401
 
 
-class DbCollection(collections.Mapping):
+class DbCollection(Mapping):
     """Collection of database objects."""
 
     def __init__(self, handle, db_type, prop_id, factory):

nixnet/database/_dbc_attributes.py

@@ -2,15 +2,18 @@
 from __future__ import division
 from __future__ import print_function
 
-import collections
+try:
+    from collections.abc import Mapping  # python 3.3+
+except ImportError:
+    from collections import Mapping  # python 2.7
 import six
 import typing  # NOQA: F401
 
 from nixnet import _funcs
 from nixnet import constants
 
 
-class DbcAttributeCollection(collections.Mapping):
+class DbcAttributeCollection(Mapping):
     """Collection for accessing DBC attributes."""
 
     def __init__(self, handle):

nixnet/database/_dbc_signal_value_table.py

@@ -2,15 +2,18 @@
 from __future__ import division
 from __future__ import print_function
 
-import collections
+try:
+    from collections.abc import Mapping  # python 3.3+
+except ImportError:
+    from collections import Mapping  # python 2.7
 import six
 import typing  # NOQA: F401
 
 from nixnet import _funcs
 from nixnet import constants
 
 
-class DbcSignalValueTable(collections.Mapping):
+class DbcSignalValueTable(Mapping):
     """Collection for accessing a DBC signal value table."""
 
     def __init__(self, handle):

nixnet/system/_collection.py

@@ -2,13 +2,16 @@
 from __future__ import division
 from __future__ import print_function
 
-import collections
+try:
+    from collections.abc import Iterable, Sized  # python 3.3+
+except ImportError:
+    from collections import Iterable, Sized  # python 2.7
 import typing  # NOQA: F401
 
 from nixnet import _cprops
 
 
-class SystemCollection(collections.Iterable, collections.Sized):
+class SystemCollection(Iterable, Sized):
     """Collection of System related objects."""
 
     def __init__(self, handle, prop_id, factory):

nixnet/system/_databases.py

@@ -2,15 +2,18 @@
 from __future__ import division
 from __future__ import print_function
 
-import collections
+try:
+    from collections.abc import Mapping  # python 3.3+
+except ImportError:
+    from collections import Mapping  # python 2.7
 import typing  # NOQA: F401
 
 import six
 
 from nixnet import _funcs
 
 
-class AliasCollection(collections.Mapping):
+class AliasCollection(Mapping):
     """Alias aliases."""
 
     def __init__(self, handle):