Cleanup.

Bryan Worrell · Bryan Worrell · commit dfcd3cff3914 · 2015-09-24T13:13:46.000-04:00
diff --git a/stix/common/confidence.py b/stix/common/confidence.py
@@ -7,10 +7,12 @@
 import stix.utils as utils
 import stix.bindings.stix_common as common_binding
 
-from . import vocabs, VocabString
-from .structured_text import StructuredTextList, StructuredTextListField
 from stix.base import ElementField, AttributeField
 
+from .vocabs import VocabString
+from .structured_text import StructuredTextList, StructuredTextListField
+
+
 class Confidence(stix.Entity):
     _namespace = 'http://stix.mitre.org/common-1'
     _binding = common_binding
@@ -30,6 +32,7 @@ def __init__(self, value=None, timestamp=None, description=None, source=None):
         self.value = value
         self.description = description
         self.source = source
+
         # TODO: support confidence_assertion_chain
         # self.confidence_assertion_chain = None
     
diff --git a/stix/common/names.py b/stix/common/names.py
@@ -10,7 +10,7 @@
 
 
 class Names(stix.EntityList):
-    _namespace = "http://stix.mitre.org/common-1"
+    _namespace = 'http://stix.mitre.org/common-1'
     _binding = common_binding
     _binding_class = _binding.NamesType
     _contained_type = VocabString
diff --git a/stix/indicator/sightings.py b/stix/indicator/sightings.py
@@ -24,10 +24,6 @@ class Sighting(stix.Entity):
     confidence = ElementField("Confidence", Confidence)
     related_observables = ElementField("Related_Observables")
     
-    @classmethod
-    def _init_typed_fields(cls):
-        cls.related_observables.type_ = RelatedObservables
-    
     def __init__(self, timestamp=None, timestamp_precision=None, description=None):
         self._fields = {}
         self.timestamp = timestamp or utils.dates.now()
@@ -37,6 +33,10 @@ def __init__(self, timestamp=None, timestamp_precision=None, description=None):
         self.reference = None
         self.confidence = None
 
+    @classmethod
+    def _init_typed_fields(cls):
+        cls.related_observables.type_ = RelatedObservables
+
     """
     @timestamp.setter
     def timestamp(self, value):
diff --git a/stix/test/__init__.py b/stix/test/__init__.py
@@ -113,7 +113,7 @@ def round_trip(o, output=False, list_=False):
         print str(ex)
         ns_info.finalize()
         print ns_info.finalized_namespaces
-        raise ex
+        raise
 
     if output:
         print(xml_string)
