ARIA-417 Encoding models to json is too strict

apache · Dec 4, 2017 · 1f5260c · 1f5260c
1 parent bc2701c
commit 1f5260c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/aria/modeling/utils.py b/aria/modeling/utils.py
@@ -35,15 +35,14 @@ def __init__(self, *args, **kwargs):
         # Just here to make sure Sphinx doesn't grab the base constructor's docstring
         super(ModelJSONEncoder, self).__init__(*args, **kwargs)
 
-    def default(self, o):                                                                           # pylint: disable=method-hidden
-        from .mixins import ModelMixin
-        if isinstance(o, ModelMixin):
+    def default(self, o):  # pylint: disable=method-hidden
+        try:
             if hasattr(o, 'value'):
                 dict_to_return = o.to_dict(fields=('value',))
                 return dict_to_return['value']
             else:
                 return o.to_dict()
-        else:
+        except AttributeError:
             return JSONEncoder.default(self, o)