From 661b2b87a74710b914b4f38849a70651271d0f6b Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 16 Jul 2012 15:53:24 -0500 Subject: [PATCH] added decimal support for json in serializers.py --- VERSION | 2 +- gluon/serializers.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c60db99a..8e894610 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-16 15:36:41) dev +Version 2.00.0 (2012-07-16 15:53:20) dev diff --git a/gluon/serializers.py b/gluon/serializers.py index 5e44cc51..5597cebd 100644 --- a/gluon/serializers.py +++ b/gluon/serializers.py @@ -4,6 +4,7 @@ Copyrighted by Massimo Di Pierro License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html) """ import datetime +import decimal from storage import Storage from html import TAG from html import xmlescape @@ -27,6 +28,8 @@ def custom_json(o): return o.isoformat()[:19].replace('T',' ') elif isinstance(o, (int, long)): return int(o) + elif isinstance(o, decimal.Decimal): + return str(o) elif isinstance(o, lazyT): return str(o) elif hasattr(o,'as_list') and callable(o.as_list):