Use __new__ magic method.

gtback · gtback · commit 3daf72a2d86e · 2013-09-05T15:28:11.000-04:00
diff --git a/cybox/__init__.py b/cybox/__init__.py
@@ -155,8 +155,7 @@ def from_obj(cls, cls_obj=None):
                 elif issubclass(field.type_, Entity):
                     val = field.type_.from_obj(val)
                 else:
-                    #TODO: fix this
-                    val = field.type_.make(val)
+                    val = field.type_(val)
             setattr(entity, field.attr_name, val)
 
         return entity
@@ -189,7 +188,7 @@ def from_dict(cls, cls_dict=None):
                     val = field.type_.from_dict(val)
                 else:
                     #TODO: fix this
-                    val = field.type_.make(val)
+                    val = field.type_(val)
             setattr(entity, field.attr_name, val)
 
         return entity
diff --git a/cybox/xs.py b/cybox/xs.py
@@ -1,9 +1,9 @@
 class _type_base(object):
     """A base class for all of these types"""
 
-    # TODO: get this working with python magic __new__ or __init__
-    @classmethod
-    def make(cls, val):
+    _try_cast = True
+
+    def __new__(cls, val):
         if val is None:
             return None
         return cls._pytype(val)
