From f2101abacff1069303d2afa204106e049c633654 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 22 Sep 2007 13:21:54 +0000 Subject: Fixed #5553 -- Fixed a serialization problem with datetime and time objects. Thanks to pigletto for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6406 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/encoding.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'django/utils/encoding.py') diff --git a/django/utils/encoding.py b/django/utils/encoding.py index 69c3e9c28b..6daae4386d 100644 --- a/django/utils/encoding.py +++ b/django/utils/encoding.py @@ -1,5 +1,6 @@ import types import urllib +import datetime from django.utils.functional import Promise class StrAndUnicode(object): @@ -30,7 +31,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'): If strings_only is True, don't convert (some) non-string-like objects. """ - if strings_only and isinstance(s, (types.NoneType, int, long)): + if strings_only and isinstance(s, (types.NoneType, int, long, datetime.datetime, datetime.time, float)): return s if not isinstance(s, basestring,): if hasattr(s, '__unicode__'): -- cgit v1.3