Merge pull request #234 from BrianPainter/master

if the object is a decimal, return the string representation of it.

1 files changed, 8 insertions, 1 deletions

diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py
index fb66745..72c3d02 100644
--- a/tablib/formats/_json.py
+++ b/tablib/formats/_json.py
@@ -2,6 +2,7 @@
 
 """ Tablib - JSON Support
 """
+import decimal
 
 import tablib
 
@@ -16,7 +17,13 @@ extensions = ('json', 'jsn')
 
 
 def date_handler(obj):
-    return obj.isoformat() if hasattr(obj, 'isoformat') else obj
+    if isinstance(obj, decimal.Decimal):
+        return str(obj)
+    elif hasattr(obj, 'isoformat'):
+        return obj.isoformat()
+    else:
+        return obj
+    # return obj.isoformat() if hasattr(obj, 'isoformat') else obj
 
 
 def export_set(dataset):