From 17890027a6636711d588d1c0c50825dd46a103b5 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 6 Mar 2013 12:31:39 -0600 Subject: [PATCH] fixed issue 1357, date/datetime serialization in as_dict, thanks Alan --- VERSION | 2 +- gluon/dal.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 35c95901..70efd061 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.2-stable+timestamp.2013.03.06.12.28.09 +Version 2.4.2-stable+timestamp.2013.03.06.12.31.02 diff --git a/gluon/dal.py b/gluon/dal.py index 314e870f..56e2eb8a 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -9535,6 +9535,10 @@ class Query(object): newd[k] = loop(v.__dict__) elif isinstance(v, SERIALIZABLE_TYPES): newd[k] = v + elif isinstance(v, (datetime.date, + datetime.time, + datetime.datetime)): + newd[k] = unicode(v) elif k == "op": if callable(v): newd[k] = v.__name__