Merge remote-tracking branch 'origin/develop' into develop

1 files changed, 6 insertions, 2 deletions

diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py
index 944afe0..777040a 100644
--- a/tablib/formats/_json.py
+++ b/tablib/formats/_json.py
@@ -13,14 +13,18 @@ title = 'json'
 extensions = ('json', 'jsn')
 
 
+def date_handler(obj):
+    return obj.isoformat() if hasattr(obj, 'isoformat') else obj
+
+
 def export_set(dataset):
     """Returns JSON representation of Dataset."""
-    return json.dumps(dataset.dict)
+    return json.dumps(dataset.dict, default=date_handler)
 
 
 def export_book(databook):
     """Returns JSON representation of Databook."""
-    return json.dumps(databook._package())
+    return json.dumps(databook._package(), default=date_handler)
 
 
 def import_set(dset, in_stream):