summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-08-09 21:16:59 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-08-09 21:16:59 +0000
commitc7bd48cb9f645e5ff07d1e68b86130e3bb2b043f (patch)
treea0459672ce695501236fa89879615a2896b42637 /django/utils
parent9b263c61f805947a06473fd5ca170e8b970aae32 (diff)
[soc2010/query-refactor] Improved the ListField implementation, and added an EmbeddedModelField.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/encoding.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index e2d7249903..c4139d9171 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -47,6 +47,7 @@ def is_protected_type(obj):
return isinstance(obj, (
types.NoneType,
int, long,
+ list,
datetime.datetime, datetime.date, datetime.time,
float, Decimal)
)