Merge pull request #318 from emmanvg/master

Replace __hash__ definition for __hash__ as class variable.

stix/common/kill_chains/__init__.py

@@ -3,15 +3,16 @@
 
 from mixbox import fields
 from mixbox import typedlist
+from mixbox import entities
 
 # internal
 import stix
 import stix.bindings.stix_common as common_binding
 
-from mixbox.vendor.six import string_types
-
 
 class KillChain(stix.Entity):
+    __hash__ = entities.Entity.__hash__
+
     _binding = common_binding
     _namespace = 'http://stix.mitre.org/common-1'
     _binding_class = _binding.KillChainType
@@ -61,6 +62,8 @@ def _dict_as_list(cls):
 
 
 class KillChainPhase(stix.Entity):
+    __hash__ = entities.Entity.__hash__
+
     _binding = common_binding
     _namespace = 'http://stix.mitre.org/common-1'
     _binding_class = _binding.KillChainPhaseType
@@ -88,10 +91,6 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
-    def __hash__(self):
-        # TODO (bworrell): Is all the tuple(sorted(...))) needed?
-        return hash(tuple(sorted(self.to_dict().items())))
-
 
 class KillChainPhaseReference(KillChainPhase):
     _binding = common_binding

stix/common/vocabs.py

@@ -28,6 +28,7 @@ def validate_value(instance, value):
         error = error.format(**locals())
         raise ValueError(error)
 
+
 class VocabList(typedlist.TypedList):
     """VocabString fields can be any type of VocabString, though there is often
     a preferred/default VocabString type.
@@ -80,6 +81,8 @@ def entity_class(cls, key):
 
 
 class VocabString(stix.Entity):
+    __hash__ = entities.Entity.__hash__
+
     _binding = stix_common_binding
     _binding_class = stix_common_binding.ControlledVocabularyStringType
     _namespace = 'http://stix.mitre.org/common-1'