import changes to prevent deprecation warnings

collections module. Fixed #367

Author: emmanvg

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',
     'python-dateutil',
 ]

stix/base.py

@@ -8,6 +8,7 @@
 from sys import version_info
 
 # mixbox
+from mixbox import compat
 from mixbox import idgen
 from mixbox import entities
 from mixbox import fields
@@ -311,7 +312,7 @@ def istypeof(cls, obj):
         return isinstance(obj, cls)
 
 
-class TypedList(TypedCollection, collections.MutableSequence):
+class TypedList(TypedCollection, compat.MutableSequence):
     def __init__(self, *args):
         TypedCollection.__init__(self, *args)
 

stix/common/profiles.py

@@ -3,13 +3,14 @@
 
 import collections
 
+from mixbox import compat
 from mixbox import fields
 
 import stix
 from stix.bindings import stix_common as stix_common_binding
 
 
-class Profiles(collections.MutableSequence, stix.Entity):
+class Profiles(compat.MutableSequence, stix.Entity):
     _binding = stix_common_binding
     _binding_class = stix_common_binding.ProfilesType
     _namespace = 'http://stix.mitre.org/common-1'

stix/common/references.py

@@ -2,13 +2,14 @@
 # See LICENSE.txt for complete terms.
 import collections
 
+from mixbox import compat
 from mixbox import fields
 
 import stix
 from stix.bindings import stix_common as stix_common_binding
 
 
-class References(collections.MutableSequence, stix.Entity):
+class References(compat.MutableSequence, stix.Entity):
     _binding = stix_common_binding
     _binding_class = stix_common_binding.ReferencesType
     _namespace = 'http://stix.mitre.org/common-1'

stix/common/structured_text.py

@@ -10,7 +10,13 @@
 import stix
 import stix.utils as utils
 import stix.bindings.stix_common as stix_common_binding
-from mixbox.vendor.six import text_type
+from mixbox.vendor.six import PY2, PY3, text_type
+
+
+if PY2:
+    from collections import Sequence
+elif PY3:
+    from collections.abc import Sequence
 
 
 #: Default ordinality value for StructuredText.
@@ -105,7 +111,7 @@ def _unset_default(text):
         text.ordinality = ordinality
 
 
-class StructuredTextList(stix.TypedCollection, collections.Sequence):
+class StructuredTextList(stix.TypedCollection, Sequence):
     """A sequence type used to store StructureText objects.
 
     Args: