Merge pull request #7 from bworrell/master

bug fixes in from_dict() methods

Author: Bryan Worrell

examples/ex_01.py

@@ -14,7 +14,7 @@
 
 def main():
     fn = 'ex_01.xml'
-    (stix_package, stix_package_obj) = STIXPackage.from_xml(fn)
+    (stix_package, stix_package_binding_obj) = STIXPackage.from_xml(fn)
     stix_dict = stix_package.to_dict() # parse to dictionary
     pprint(stix_dict)
 

stix/core/stix_header.py

@@ -74,7 +74,7 @@ def to_obj(self, return_obj=None):
 
     @classmethod
     def from_dict(cls, dict_repr, return_obj=None):
-        if not dict:
+        if not dict_repr:
             return None
 
         if not return_obj: