Merge remote-tracking branch 'origin/master'

STIXProject · Jul 30, 2013 · 2f33c4f · 2f33c4f
2 parents 807383e + 2784544
commit 2f33c4f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/stix/extensions/identity/ciq_identity_3_0.py b/stix/extensions/identity/ciq_identity_3_0.py
@@ -79,7 +79,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -94,7 +94,7 @@ def from_obj(cls, obj, return_obj=None):
             for role in roles:
                 return_obj.add_role(role)
 
-        if specification:
+        if specification is not None:
             return_obj.specification = STIXCIQIdentity3_0.from_obj(specification)
 
         return return_obj 
@@ -159,7 +159,7 @@ def party_name(self, value):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -257,7 +257,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -361,7 +361,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj (cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -429,7 +429,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -514,7 +514,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -651,7 +651,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -725,7 +725,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:
@@ -803,7 +803,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_obj(cls, obj, return_obj=None):
-        if not obj:
+        if obj is None:
             return None
 
         if not return_obj:

diff --git a/stix/indicator/indicator.py b/stix/indicator/indicator.py
@@ -62,7 +62,7 @@ def observables(self, valuelist):
 
     @property
     def indicator_type(self):
-        return self._indicator_tye
+        return self._indicator_type
 
     @indicator_type.setter
     def indicator_type(self, value):