Fixed AttributeErrors due to small errors (gophish#4)

martindube · jordan-wright · commit 2d3ccfcc17be · 2017-02-22T23:12:34.000-06:00
diff --git a/gophish/models.py b/gophish/models.py
@@ -20,7 +20,7 @@ def as_dict(self):
             if isinstance(val, datetime):
                 val = val.isoformat()
             # Parse custom classes
-            elif val and not isinstance(val, (str, list, dict)):
+            elif val and not isinstance(val, (int, float, str, list, dict)):
                 val = val.as_dict()
             # Parse lists of objects
             elif isinstance(val, list):
@@ -91,7 +91,7 @@ def parse(cls, json):
         return result
 
 
-class TimelineEntry(object):
+class TimelineEntry(Model):
     _valid_properties = {'email': None, 'time': None, 'message': None, 'details': None}
 
     @classmethod
