changes to prevent deprecation warnings

Author: emmanvg

maec/utils/comparator.py

@@ -1,5 +1,5 @@
 # MAEC Comparator Classes
-import collections
+from mixbox import compat
 
 class ComparisonResult(object):
     def __init__(self, bundle_list, lookup_table):
@@ -154,7 +154,7 @@ def get_val(cls, obj, typed_field, hash_val, nested_elements = None):
                 val = getattr(obj.properties, str(typed_field))
                 if val is not None:
                     hash_val += str(typed_field) + ":"
-                    if isinstance(val, collections.MutableSequence):
+                    if isinstance(val, compat.MutableSequence):
                         for list_item in val:
                             if '/' in str(nested_elements[0]):
                                 hash_val += '['

maec/utils/deduplicator.py

@@ -4,9 +4,9 @@
 
 # See LICENSE.txt for complete terms
 
-import collections
 import copy
 
+from mixbox import compat
 from mixbox import entities
 
 from cybox.core import RelatedObject, AssociatedObject
@@ -179,7 +179,7 @@ def get_typedfield_values(cls, val, name, values, ignoreCase=False):
         # If the value is a mutable sequence, attempt to find TypedFields as
         # in each item. EntityLists are Entity subclasses that can have
         # TypedFields, so we don't make this an elif.
-        if isinstance(val, collections.MutableSequence):
+        if isinstance(val, compat.MutableSequence):
             for list_item in val:
                 cls.get_typedfield_values(list_item, name, values, ignoreCase)
 

setup.py

@@ -30,7 +30,7 @@ def get_long_description():
 install_requires = [
     'lxml>=2.2.3 ; python_version == "2.7" or python_version >= "3.5"',
     'lxml>=2.2.3,<4.4.0 ; python_version > "2.7" and python_version < "3.5"',
-    'mixbox>=1.0.2',
+    'mixbox>=1.0.4',
     'cybox>=2.1.0.13,<2.1.1.0',
 ]