Change mixbox Entities to stix Entities

apsillers · apsillers · commit 87d56b1de17f · 2015-11-13T14:34:52.000-05:00
diff --git a/stix/core/stix_package.py b/stix/core/stix_package.py
@@ -40,7 +40,7 @@
 import stix.bindings.stix_core as stix_core_binding
 import mixbox.entities
 
-class STIXPackage(Cached, mixbox.entities.Entity):
+class STIXPackage(Cached, stix.Entity):
     """A STIX Package object.
 
     Args:
diff --git a/stix/incident/affected_asset.py b/stix/incident/affected_asset.py
@@ -149,7 +149,7 @@ class AssetType(VocabString):
     _binding  = incident_binding
     _binding_class = incident_binding.AssetTypeType
     
-    count_affected = fields.TypedField("count_affected")
+    count_affected = fields.IntegerField("count_affected")
     
     def __init__(self, value=None, count_affected=None):
         super(AssetType, self).__init__(value)
diff --git a/stix/incident/external_id.py b/stix/incident/external_id.py
@@ -5,7 +5,7 @@
 import stix.bindings.incident as incident_binding
 from mixbox import fields, entities
 
-class ExternalID(entities.Entity):
+class ExternalID(stix.Entity):
     _namespace = "http://stix.mitre.org/Incident-1"
     _binding  = incident_binding
     _binding_class = incident_binding.ExternalIDType
diff --git a/stix/incident/loss_estimation.py b/stix/incident/loss_estimation.py
@@ -5,7 +5,7 @@
 import stix.bindings.incident as incident_binding
 from mixbox import entities, fields
 
-class LossEstimation(entities.Entity):
+class LossEstimation(stix.Entity):
     _namespace = "http://stix.mitre.org/Incident-1"
     _binding  = incident_binding
     _binding_class = incident_binding.LossEstimationType
diff --git a/stix/ttp/attack_pattern.py b/stix/ttp/attack_pattern.py
@@ -13,7 +13,7 @@
 
 from mixbox import fields, entities
 
-class AttackPattern(Cached, entities.Entity):
+class AttackPattern(Cached, stix.Entity):
     _binding = ttp_binding
     _binding_class = _binding.AttackPatternType
     _namespace = "http://stix.mitre.org/TTP-1"
diff --git a/stix/ttp/behavior.py b/stix/ttp/behavior.py
@@ -12,9 +12,7 @@
 from .exploit import Exploit
 from .attack_pattern import AttackPattern
 
-from mixbox import entities, fields
-
-class Behavior(entities.Entity):
+class Behavior(stix.Entity):
     _binding = ttp_binding
     _binding_class = _binding.BehaviorType
     _namespace = "http://stix.mitre.org/TTP-1"
diff --git a/stix/ttp/exploit.py b/stix/ttp/exploit.py
@@ -11,9 +11,9 @@
 # bindings
 import stix.bindings.ttp as ttp_binding
 
-from mixbox import entities, fields
+from mixbox import fields
 
-class Exploit(Cached, entities.Entity):
+class Exploit(Cached, stix.Entity):
     _binding = ttp_binding
     _binding_class = _binding.ExploitType
     _namespace = "http://stix.mitre.org/TTP-1"
diff --git a/stix/ttp/infrastructure.py b/stix/ttp/infrastructure.py
@@ -15,7 +15,7 @@
 import stix.bindings.ttp as ttp_binding
 from mixbox import fields, entities
 
-class Infrastructure(Cached, entities.Entity):
+class Infrastructure(Cached, stix.Entity):
     _binding = ttp_binding
     _binding_class = _binding.InfrastructureType
     _namespace = "http://stix.mitre.org/TTP-1"
