Changed __dict__ access to vars() calls.

Author: Bryan Worrell

stix/common/vocabs.py

@@ -149,7 +149,7 @@ def from_dict(cls, vocab_dict, return_obj=None):
 
 def _get_terms(vocab_class):
     """Helper function used by register_vocab."""
-    for k, v in vocab_class.__dict__.items():
+    for k, v in vars(vocab_class).items():
         if k.startswith("TERM_"):
             yield v
 

stix/utils/__init__.py

@@ -251,7 +251,7 @@ def iter_vars(obj):
     def check(name):
         return name not in ('__input_namespaces__', '__input_schemalocations__')
 
-    instance_vars = obj.__dict__.iteritems()
+    instance_vars = vars(obj).iteritems()
     return ((attr_name(name), val) for name, val in instance_vars if check(name))
 
 

stix/utils/walk.py

@@ -28,7 +28,7 @@ def _iter_vars(obj):
     attrs = []
 
     if hasattr(obj, "__dict__"):
-        attrs.append(obj.__dict__.iteritems())
+        attrs.append(vars(obj).iteritems())
 
     if hasattr(obj, "_fields"):
         attrs.append(obj._fields.iteritems())