Merge pull request #1253 from XVilka/fix-collections

Fix collections

2 files changed, 10 insertions, 2 deletions

diff --git a/miasm/core/utils.py b/miasm/core/utils.py
index ed630bde..cfe96de4 100644
--- a/miasm/core/utils.py
+++ b/miasm/core/utils.py
@@ -3,7 +3,11 @@ import sys
 from builtins import range
 import struct
 import inspect
-from collections import MutableMapping as DictMixin
+
+try:
+    from collections.abc import MutableMapping as DictMixin
+except ImportError:
+    from collections import MutableMapping as DictMixin
 
 from operator import itemgetter
 import codecs
diff --git a/miasm/jitter/jitload.py b/miasm/jitter/jitload.py
index 85d5636f..20d795e6 100644
--- a/miasm/jitter/jitload.py
+++ b/miasm/jitter/jitload.py
@@ -1,7 +1,11 @@
 import logging
 import warnings
 from functools import wraps
-from collections import Sequence, namedtuple
+from collections import namedtuple
+try:
+    from collections.abc import Sequence
+except ImportError:
+    from collections import Sequence
 
 from future.utils import viewitems