a more generic support to json encoding
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9dcb4af5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9dcb4af5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9dcb4af5 Branch: refs/heads/generic_storage_update_serialization_logger_handler Commit: 9dcb4af5a214c3ce935cb5a7d4d1e661617152ca Parents: 4196a87 Author: max-orlov <[email protected]> Authored: Tue Nov 28 17:24:31 2017 +0200 Committer: max-orlov <[email protected]> Committed: Tue Nov 28 17:30:02 2017 +0200 ---------------------------------------------------------------------- aria/modeling/utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9dcb4af5/aria/modeling/utils.py ---------------------------------------------------------------------- diff --git a/aria/modeling/utils.py b/aria/modeling/utils.py index 6e851f2..72fd51f 100644 --- a/aria/modeling/utils.py +++ b/aria/modeling/utils.py @@ -36,14 +36,13 @@ class ModelJSONEncoder(JSONEncoder): super(ModelJSONEncoder, self).__init__(*args, **kwargs) def default(self, o): # pylint: disable=method-hidden - from .mixins import ModelMixin - if isinstance(o, ModelMixin): + 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: return JSONEncoder.default(self, o)
