summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2016-02-07 06:44:20 -0500
committerKenneth Reitz <me@kennethreitz.org>2016-02-07 06:44:20 -0500
commit38e1ee6c3ddda44a47fba729a02027b382dd35cb (patch)
treeffbb57f73aebde9b3102a70bd4a6ed27b732a368
parent995eabad37c827d34539500630c710ccf510d7c1 (diff)
parentbc6398ffb0a80375d0cb0ad06544d17d2cd9ecc4 (diff)
downloadtablib-38e1ee6c3ddda44a47fba729a02027b382dd35cb.tar.gz
Merge pull request #186 from hdzierz/develop
Added a mechanism to avoid datetime.datetime issues when serializing dat...
-rw-r--r--tablib/formats/_json.py8
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):