newforms-admin: Merged to [6416]

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6417 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 1 deletions

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__'):